diff --git a/README.md b/README.md index 2fb88b3c0e83ea1b04b27b5df8066d15312b3d87..478f72f0c3b244328c3f07f4d8007a8c350f2243 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,26 @@ -### 注意 +**项目代码开源免费可商用 遵循开源协议即可** -不知道为什么每年上半年（1月至6月）就会有大量的学生朋友来这里做毕业设计或者准备实习工作，这个项目不是用来做这些事情的，如果您是因为这些事情才关注这个项目的话，请自行下载研究，就不要加交流群了，谢谢合作！ +**过去、现在和未来都不会有商业版！！！** ### 项目介绍 星云ERP基于SpringBoot框架，为中小企业提供完全开源、永久免费、用户体验好的进销存ERP系统，解决开店难、管理难、数据统计难的问题。星云ERP主要包括基础信息管理、商品中心、采购管理、销售管理、零售管理、库存管理、盘点管理、结算管理等，各业务模块均支持参数配置，满足实际遇到的各种业务场景。丰富的报表模块支持用户做各项数据分析。同时支持对部门、角色、用户、权限等进行精细化管理。最终，达到业务线上化、透明化、简易化管理的目标，实现物流、资金流、信息流的一体化管控。 -#### 单体架构 +### 开源协议说明 +> **已申请软著，您如果需要修改源码或者二开，需要注意以下几点：** +> * 请不要删除和修改根目录下的LICENSE文件。 +> * 请不要删除和修改源码头部的版权声明。 +> * 本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处、作者声明等。 +> * 分发源码时，请注明软件出处 https://www.lframework.com/ +> * 不可二次分发开源参与同类竞品。 +#### 具体说明 +> * 不可二次分发开源参与同类竞品指的是：不可以基于本项目代码二开后再进行开源。 +> * 分发源码时，注明软件出处的目的：分发源码时，接收源码的人也需要知晓上述的注意事项，所以要注明软件出处。 +> * 允许改包名，但是不要删除源码和相关描述文件的项目出处、作者声明等信息。 -集成常用的SpringBoot、MybatisPlus等框架，更利于上手使用或二次开发。 - -#### 关于商业使用的说明 +### 单体架构 -项目使用Apache 2.0 License，编写的代码无任何闭源情况，均可免费使用。我们对商业使用行为没有限制，只需要遵循Apache2.0 License即可。 +集成常用的SpringBoot、MybatisPlus等框架，更利于上手使用或二次开发。 ### 演示环境地址 @@ -87,20 +95,16 @@ QQ交流群号： **717574596（已满员）** **562654879** 项目依赖的底层框架全部封装成starter，关于这部分的代码详见：点此进入 -BPM工作流目前是整合AgileBPM工作流管理平台，由于AgileBPM的Licence是GPL，所以使用这部分功能需要遵守GPL许可证的限制条件，关于这部分的代码详见：点此进入，如果不使用此部分代码及功能，请忽略此条说明 - ### License 项目使用Apache 2.0许可证，请遵守此许可证的限制条件。 ### 集成第三方库 -AgileBPM 工作流管理平台 - Sa-Token 统一用户鉴权 -J2Cache 基于内存和Redis的两级Java缓存框架 - knife4j knife4j是为Java MVC框架集成Swagger生成Api文档的工具 -FormCreate 强大的动态表单生成器 \ No newline at end of file +FormCreate 强大的动态表单生成器 + +Warm-Flow Dromara Warm-Flow国产工作流引擎 \ No newline at end of file diff --git a/cloud/conf/common.yaml b/cloud/conf/common.yaml index 0c5edd4b77b71c5d2a2392266bc66e3edd638e71..8c06950f1e0f3cdcff634c1d52a25e2a504ef0f8 100644 --- a/cloud/conf/common.yaml +++ b/cloud/conf/common.yaml @@ -144,7 +144,7 @@ pagehelper: support-methods-arguments: false mybatis-plus: mapper-locations: classpath*:/mappers/**/*.xml - typeEnumsPackage: com.lframework.xingyun.**.enums + typeEnumsPackage: com.lframework.xingyun.**.enums,com.lframework.xingyun.**.enums op-logs: #是否开启 @@ -164,4 +164,3 @@ feign: default: connect-timeout: 500 read-time-out: 60000 - diff --git a/cloud/xingyun-cloud-api/pom.xml b/cloud/xingyun-cloud-api/pom.xml index 0bcafe78a6ebe27c2569be75d1910f077c750395..56cb7667b6a6868bdaa524f742a37787c3f403a9 100644 --- a/cloud/xingyun-cloud-api/pom.xml +++ b/cloud/xingyun-cloud-api/pom.xml @@ -38,16 +38,6 @@ xingyun-chart - - com.lframework - xingyun-sys - - - - com.lframework - xingyun-export - - com.lframework cloud-starter diff --git a/cloud/xingyun-cloud-api/src/main/java/com/lframework/xingyun/api/XingYunCloudApiApplication.java b/cloud/xingyun-cloud-api/src/main/java/com/lframework/xingyun/api/XingYunCloudApiApplication.java index 74d9b95c47b0cf29aff592f2adb376789324f03c..f6b37e85e927b7c6ed509349f7914cebc5b8ff46 100644 --- a/cloud/xingyun-cloud-api/src/main/java/com/lframework/xingyun/api/XingYunCloudApiApplication.java +++ b/cloud/xingyun-cloud-api/src/main/java/com/lframework/xingyun/api/XingYunCloudApiApplication.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.api; import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; -import com.lframework.starter.web.annotations.locker.EnableLock; -import com.lframework.starter.web.annotations.locker.LockType; +import com.lframework.starter.web.core.annotations.locker.EnableLock; +import com.lframework.starter.web.core.annotations.locker.LockType; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/cloud/xingyun-cloud-api/src/main/resources/project.yaml b/cloud/xingyun-cloud-api/src/main/resources/project.yaml index 25c6863ea03ccb5b90aef5dcc632269242c64395..df3fb5e0b2ff95c077c07efead571aada5249874 100644 --- a/cloud/xingyun-cloud-api/src/main/resources/project.yaml +++ b/cloud/xingyun-cloud-api/src/main/resources/project.yaml @@ -70,4 +70,15 @@ magic-api: backup: enable: true max-history: 14 #备份保留天数，-1为永久保留 - table-name: magic_api_file_backup \ No newline at end of file + table-name: magic_api_file_backup + +# warm-flow +warm-flow: + token-name: ${sa-token.token-name} + data-fill-handler-path: com.lframework.starter.bpm.handlers.BpmDataFillHandler + # 是否开启逻辑删除（orm框架本身不支持逻辑删除，可通过这种方式开启） + logic_delete: true + # 逻辑删除字段值（开启后默认为2） + logic_delete_value: 2 + # 逻辑未删除字段（开启后默认为0） + logic_not_delete_value: 0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 841359edb46f1c9b07dd46ae9082e5f88ba2b096..67947811d63ab3373a9ab1dd3a37411ed6a9c5f8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,18 +24,16 @@ xingyun-sc xingyun-chart xingyun-settle - xingyun-sys cloud/xingyun-cloud-api xingyun-comp cloud/xingyun-cloud-gateway - xingyun-export 8 8 1.0.0-SNAPSHOT - 3.1.6 + 4.0.5 @@ -77,24 +75,12 @@ ${xingyun.version} - - com.lframework - xingyun-sys - ${xingyun.version} - - com.lframework xingyun-settle ${xingyun.version} - - com.lframework - xingyun-export - ${xingyun.version} - - com.lframework xingyun-core diff --git a/xingyun-api/pom.xml b/xingyun-api/pom.xml index 7212b9fc41e7266dd947bf103cee1a5b3bb45efd..1e79c25ee6fe52a957208493a5010ea176ccd636 100644 --- a/xingyun-api/pom.xml +++ b/xingyun-api/pom.xml @@ -37,16 +37,6 @@ xingyun-chart - - com.lframework - xingyun-sys - - - - com.lframework - xingyun-export - - com.lframework rabbitmq-starter diff --git a/xingyun-api/src/main/java/com/lframework/xingyun/api/XingYunApiApplication.java b/xingyun-api/src/main/java/com/lframework/xingyun/api/XingYunApiApplication.java index b59dd6ce18d0e5ee9c392392d617c0e443b09968..68963fdbb77d39cc9a52e36b43a7e589a79058df 100644 --- a/xingyun-api/src/main/java/com/lframework/xingyun/api/XingYunApiApplication.java +++ b/xingyun-api/src/main/java/com/lframework/xingyun/api/XingYunApiApplication.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.api; import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; -import com.lframework.starter.web.annotations.locker.EnableLock; -import com.lframework.starter.web.annotations.locker.LockType; +import com.lframework.starter.web.core.annotations.locker.EnableLock; +import com.lframework.starter.web.core.annotations.locker.LockType; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/xingyun-api/src/main/resources/application-dev.yml b/xingyun-api/src/main/resources/application-dev.yml index 41f339886029cb1426362f58714d959527c2d299..7897bda15f74e29e667de88abbf63cd11ffe8e11 100644 --- a/xingyun-api/src/main/resources/application-dev.yml +++ b/xingyun-api/src/main/resources/application-dev.yml @@ -5,6 +5,7 @@ logging: level: com.lframework: DEBUG io.lettuce.core.protocol: OFF + org.dromara.warm.flow: DEBUG spring: servlet: diff --git a/xingyun-api/src/main/resources/application.yml b/xingyun-api/src/main/resources/application.yml index 9c83f39434d8f112527adeb460fcb91c9ff5005e..7731ce123ca9dfe3828fd0f58cc1396a49305d13 100644 --- a/xingyun-api/src/main/resources/application.yml +++ b/xingyun-api/src/main/resources/application.yml @@ -207,4 +207,15 @@ magic-api: backup: enable: true max-history: 14 #备份保留天数，-1为永久保留 - table-name: magic_api_file_backup \ No newline at end of file + table-name: magic_api_file_backup + +# warm-flow +warm-flow: + token-name: ${sa-token.token-name} + data-fill-handler-path: com.lframework.starter.bpm.handlers.BpmDataFillHandler + # 是否开启逻辑删除（orm框架本身不支持逻辑删除，可通过这种方式开启） + logic_delete: true + # 逻辑删除字段值（开启后默认为2） + logic_delete_value: 2 + # 逻辑未删除字段（开启后默认为0） + logic_not_delete_value: 0 \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/all/platform.sql b/xingyun-api/src/main/resources/db/all/platform.sql index d28f69348193cf2edea7f41a0e868d06daff4f95..1a03e1837a721468cf1889c9ac22d8454d623bbc 100644 --- a/xingyun-api/src/main/resources/db/all/platform.sql +++ b/xingyun-api/src/main/resources/db/all/platform.sql @@ -5,418 +5,386 @@ 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) NOT NULL, - `file_content` mediumtext, +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, PRIMARY KEY (`file_path`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci 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) NOT NULL COMMENT '原对象ID', +CREATE TABLE `magic_api_file_backup` ( + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '原对象ID', `create_date` bigint(13) NOT NULL COMMENT '备份时间', - `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; + `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; -- ---------------------------- -- 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) 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; +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; -- ---------------------------- -- 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) NOT NULL, - `CALENDAR_NAME` varchar(190) NOT NULL, +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, `CALENDAR` blob NOT NULL, - PRIMARY KEY (`SCHED_NAME`,`CALENDAR_NAME`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; + PRIMARY KEY (`SCHED_NAME`, `CALENDAR_NAME`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci 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) 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; +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; -- ---------------------------- -- 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) 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, +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, `FIRED_TIME` bigint(13) NOT NULL, `SCHED_TIME` bigint(13) NOT NULL, `PRIORITY` int(11) NOT NULL, - `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; + `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; -- ---------------------------- -- 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) 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; +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; -- ---------------------------- -- 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) NOT NULL, - `LOCK_NAME` varchar(40) NOT NULL, - PRIMARY KEY (`SCHED_NAME`,`LOCK_NAME`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; +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; -- ---------------------------- -- 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) NOT NULL, - `TRIGGER_GROUP` varchar(190) NOT NULL, - PRIMARY KEY (`SCHED_NAME`,`TRIGGER_GROUP`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; +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; -- ---------------------------- -- 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) NOT NULL, - `INSTANCE_NAME` varchar(190) NOT NULL, +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, `LAST_CHECKIN_TIME` bigint(13) NOT NULL, `CHECKIN_INTERVAL` bigint(13) NOT NULL, - PRIMARY KEY (`SCHED_NAME`,`INSTANCE_NAME`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; + PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci 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) NOT NULL, - `TRIGGER_NAME` varchar(190) NOT NULL, - `TRIGGER_GROUP` varchar(190) NOT NULL, +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, `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`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 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`) ON DELETE RESTRICT ON UPDATE RESTRICT +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci 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) 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; +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; -- ---------------------------- -- 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) 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, +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, `START_TIME` bigint(13) NOT NULL, - `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; + `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; -- ---------------------------- -- 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) 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', + `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', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `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 '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统模块'; +) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统模块' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_module -- ---------------------------- -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; +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'); +INSERT INTO `sys_module` VALUES (16, '审批流程', '管理审批流程。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -- ---------------------------- -- Table structure for sys_module_tenant -- ---------------------------- DROP TABLE IF EXISTS `sys_module_tenant`; -CREATE TABLE `sys_module_tenant` ( - `id` varchar(32) NOT NULL COMMENT 'ID', +CREATE TABLE `sys_module_tenant` ( + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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 KEY `name` (`tenant_id`,`module_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='租户和系统模块关系表'; + UNIQUE INDEX `name`(`tenant_id`, `module_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '租户和系统模块关系表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_module_tenant -- ---------------------------- -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; +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'); +INSERT INTO `sys_module_tenant` VALUES ('1748649349774184463', 16, 1000, '2099-01-01 00:00:00'); -- ---------------------------- -- 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) NOT NULL COMMENT '名称', - `api_secret` varchar(100) NOT NULL COMMENT 'API秘钥', + `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秘钥', `available` tinyint(1) NOT NULL COMMENT '状态', - `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', + `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', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `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 '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `name` (`name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='开放域'; + UNIQUE INDEX `name`(`name`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '开放域' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- 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) 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密码', + `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密码', `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 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='租户'; +) ENGINE = InnoDB AUTO_INCREMENT = 1001 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '租户' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of tenant -- ---------------------------- -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; +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'); -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; diff --git a/xingyun-api/src/main/resources/db/all/tenant.sql b/xingyun-api/src/main/resources/db/all/tenant.sql index fd86d4b0d3e0d09847cf17f1449e46c56128e8a8..97160921a3f42013eb895fcf2869e9be7c96bd82 100644 --- a/xingyun-api/src/main/resources/db/all/tenant.sql +++ b/xingyun-api/src/main/resources/db/all/tenant.sql @@ -4145,6 +4145,265 @@ 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); +-- ---------------------------- +-- Table structure for flow_cu_approve_his +-- ---------------------------- +DROP TABLE IF EXISTS `flow_cu_approve_his`; +CREATE TABLE `flow_cu_approve_his` ( + `id` bigint(20) NOT NULL COMMENT 'ID', + `definition_id` bigint(20) NOT NULL COMMENT '流程定义ID', + `instance_id` bigint(20) NOT NULL COMMENT '流程实例ID', + `node_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '节点编码', + `node_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '节点名称', + `task_id` bigint(20) 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_time` datetime NOT NULL COMMENT '创建时间', + `message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明', + `skip_type` tinyint(3) NOT NULL COMMENT '审核类型', + PRIMARY KEY (`id`) USING BTREE, + INDEX `definition_id`(`definition_id`) USING BTREE, + INDEX `instance_id`(`instance_id`) USING BTREE, + INDEX `task_id`(`task_id`) USING BTREE, + INDEX `node_code`(`node_code`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程审核历史' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_cu_approve_his +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_cu_category +-- ---------------------------- +DROP TABLE IF EXISTS `flow_cu_category`; +CREATE TABLE `flow_cu_category` ( + `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'ID', + `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '名称', + `parent_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '父级ID', + PRIMARY KEY (`id`) USING BTREE, + INDEX `parent_id`(`parent_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '流程分类' ROW_FORMAT = COMPACT; + +-- ---------------------------- +-- Records of flow_cu_category +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_cu_instance +-- ---------------------------- +DROP TABLE IF EXISTS `flow_cu_instance`; +CREATE TABLE `flow_cu_instance` ( + `id` bigint(20) NOT NULL COMMENT 'ID', + `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', + `biz_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务类型', + `biz_flag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务标识', + `start_time` datetime NOT NULL COMMENT '发起时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程实例扩展表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_cu_instance +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_definition +-- ---------------------------- +DROP TABLE IF EXISTS `flow_definition`; +CREATE TABLE `flow_definition` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `flow_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程编码', + `flow_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程名称', + `category` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程类别', + `version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程版本', + `is_publish` tinyint(3) NOT NULL DEFAULT 0 COMMENT '是否发布（0未发布 1已发布 9失效）', + `form_custom` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批表单路径', + `activity_status` tinyint(3) NOT NULL DEFAULT 1 COMMENT '流程激活状态（0挂起 1激活）', + `listener_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监听器类型', + `listener_path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监听器路径', + `ext` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程定义表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_definition +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_his_task +-- ---------------------------- +DROP TABLE IF EXISTS `flow_his_task`; +CREATE TABLE `flow_his_task` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `definition_id` bigint(20) NOT NULL COMMENT '对应flow_definition表的id', + `instance_id` bigint(20) NOT NULL COMMENT '对应flow_instance表的id', + `task_id` bigint(20) NOT NULL COMMENT '对应flow_task表的id', + `node_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开始节点编码', + `node_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开始节点名称', + `node_type` tinyint(1) NULL DEFAULT NULL COMMENT '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `target_node_code` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '目标节点编码', + `target_node_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '结束节点名称', + `approver` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批者', + `cooperate_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)', + `collaborator` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '协作人', + `skip_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流转类型（PASS通过 REJECT退回 NONE无动作）', + `flow_status` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `form_custom` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批表单路径', + `message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批意见', + `variable` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '任务变量', + `ext` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '业务详情 存业务表对象json字符串', + `create_time` datetime NULL DEFAULT NULL COMMENT '任务开始时间', + `update_time` datetime NULL DEFAULT NULL COMMENT '审批完成时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '历史任务记录表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_his_task +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_instance +-- ---------------------------- +DROP TABLE IF EXISTS `flow_instance`; +CREATE TABLE `flow_instance` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `definition_id` bigint(20) NOT NULL COMMENT '对应flow_definition表的id', + `business_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id', + `node_type` tinyint(1) NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `node_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程节点编码', + `node_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程节点名称', + `variable` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '任务变量', + `flow_status` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `activity_status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '流程激活状态（0挂起 1激活）', + `def_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '流程定义json', + `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `ext` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '扩展字段，预留给业务系统使用', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程实例表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_instance +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_node +-- ---------------------------- +DROP TABLE IF EXISTS `flow_node`; +CREATE TABLE `flow_node` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `node_type` tinyint(1) NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `definition_id` bigint(20) NOT NULL COMMENT '流程定义id', + `node_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程节点编码', + `node_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程节点名称', + `permission_flag` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限标识（权限类型:权限标识，可以多个，用@@隔开)', + `node_ratio` decimal(6, 3) NULL DEFAULT NULL COMMENT '流程签署比例值', + `coordinate` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '坐标', + `any_node_skip` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任意结点跳转', + `listener_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监听器类型', + `listener_path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监听器路径', + `handler_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器类型', + `handler_path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器路径', + `form_custom` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批表单路径', + `version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '版本', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `ext` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '扩展属性', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程节点表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_node +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_skip +-- ---------------------------- +DROP TABLE IF EXISTS `flow_skip`; +CREATE TABLE `flow_skip` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `definition_id` bigint(20) NOT NULL COMMENT '流程定义id', + `now_node_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '当前流程节点的编码', + `now_node_type` tinyint(1) NULL DEFAULT NULL COMMENT '当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `next_node_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '下一个流程节点的编码', + `next_node_type` tinyint(1) NULL DEFAULT NULL COMMENT '下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `skip_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '跳转名称', + `skip_type` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '跳转类型（PASS审批通过 REJECT退回）', + `skip_condition` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '跳转条件', + `coordinate` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '坐标', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '节点跳转关联表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_skip +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_task +-- ---------------------------- +DROP TABLE IF EXISTS `flow_task`; +CREATE TABLE `flow_task` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `definition_id` bigint(20) NOT NULL COMMENT '对应flow_definition表的id', + `instance_id` bigint(20) NOT NULL COMMENT '对应flow_instance表的id', + `node_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '节点编码', + `node_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点名称', + `node_type` tinyint(1) NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `flow_status` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `form_custom` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批表单路径', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '待办任务表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_task +-- ---------------------------- + +-- ---------------------------- +-- Table structure for flow_user +-- ---------------------------- +DROP TABLE IF EXISTS `flow_user`; +CREATE TABLE `flow_user` ( + `id` bigint(20) NOT NULL COMMENT '主键id', + `type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3待办任务的委托人权限）', + `processed_by` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限人', + `associated` bigint(20) NOT NULL COMMENT '任务表id', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE, + INDEX `user_processed_type`(`processed_by`, `type`) USING BTREE, + INDEX `user_associated`(`associated`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程用户表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of flow_user +-- ---------------------------- + -- ---------------------------- -- Table structure for gen_create_column_config -- ---------------------------- @@ -5305,21 +5564,23 @@ CREATE TABLE `sys_generate_code` ( `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', `config_str` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置信息（JSONArray）', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_generate_code -- ---------------------------- -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (1, '用户编号', '[{\"type\":6,\"val\":\"U\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"58aabb1d160430444158d82e4c86cb9c7f2a\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (2, '部门编号', '[{\"type\":6,\"val\":\"D\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"6cba5a299099449fb385850b5f5c1ec4\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (3, '角色编号', '[{\"type\":6,\"val\":\"R\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"ccb59649d82547098b2626d35dd06064\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (4, '仓库编号', '[{\"type\":6,\"val\":\"CK\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"f3d4d218b3064f0d8bf7f12f5eb64fb9\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (5, '客户编号', '[{\"type\":6,\"val\":\"KH\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"0c9f51fcf94c442b9661280cf61c9ef7\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (6, '供应商编号', '[{\"type\":6,\"val\":\"GYS\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"12262adfb244488d80de51caa8edb66e\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (7, '会员编号', '[{\"type\":6,\"val\":\"HY\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"206d9d9abfdd49b4b0a4f2730b7b0288\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (8, '门店编号', '[{\"type\":6,\"val\":\"M\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"f3021011fee745c18eb6eba410c17527\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (9, '品牌编号', '[{\"type\":6,\"val\":\"B\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"331e5e9818194b3096ccbe941f6dedc6\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); -INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (10, '商品编号', '[{\"type\":6,\"val\":\"P\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"c9b6e74117f84fe68346201de3554b50\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (1, '用户编号', '[{\"type\":6,\"val\":\"U\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"58aabb1d160430444158d82e4c86cb9c7f2a\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (2, '部门编号', '[{\"type\":6,\"val\":\"D\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"6cba5a299099449fb385850b5f5c1ec4\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (3, '角色编号', '[{\"type\":6,\"val\":\"R\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"ccb59649d82547098b2626d35dd06064\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (4, '仓库编号', '[{\"type\":6,\"val\":\"CK\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"f3d4d218b3064f0d8bf7f12f5eb64fb9\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (5, '客户编号', '[{\"type\":6,\"val\":\"KH\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"0c9f51fcf94c442b9661280cf61c9ef7\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (6, '供应商编号', '[{\"type\":6,\"val\":\"GYS\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"12262adfb244488d80de51caa8edb66e\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (7, '会员编号', '[{\"type\":6,\"val\":\"HY\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"206d9d9abfdd49b4b0a4f2730b7b0288\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (8, '门店编号', '[{\"type\":6,\"val\":\"M\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"f3021011fee745c18eb6eba410c17527\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (9, '品牌编号', '[{\"type\":6,\"val\":\"B\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"331e5e9818194b3096ccbe941f6dedc6\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (10, '商品编号', '[{\"type\":6,\"val\":\"P\"},{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"c9b6e74117f84fe68346201de3554b50\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (11, '用户分组编号', '[{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"4bf9dafec322744f1f08bdf2d2569076a4d7\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` VALUES (99, '通用编号', '[{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"9dfa3174afa0464794e98e19ad7bb121ef24\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); INSERT INTO `sys_generate_code` VALUES (200, '采购订单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"37366f903834c842d5e8144bd707bdb77e35\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); INSERT INTO `sys_generate_code` VALUES (201, '采购收货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"12099be638c90d466b2a4af5465ed632459f\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); INSERT INTO `sys_generate_code` VALUES (202, '采购退单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"60fdc467f35db94c8569f6ed68d103ce5452\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); @@ -5364,7 +5625,7 @@ CREATE TABLE `sys_mail_message` ( INDEX `mail`(`mail`) USING BTREE, INDEX `biz_key`(`biz_key`) USING BTREE, INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '邮件消息' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '邮件消息' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_mail_message @@ -5451,12 +5712,20 @@ INSERT INTO `sys_menu` VALUES ('1000013', '1000013', 'SysGenerateCode', '编号 INSERT INTO `sys_menu` 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` 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` 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` VALUES ('1000015', '1000015', 'UserGroup', '用户分组', NULL, 0, '/system/user-group/index', NULL, '1000', '2', '/user-group', 0, 1, 0, 'system:user-group:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2025-01-19 18:36:11'); +INSERT INTO `sys_menu` VALUES ('1000015001', '1000015001', '', '新增用户分组', NULL, 0, '', NULL, '1000015', '8', '', 0, 2, 0, 'system:user-group:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2025-01-19 18:36:11'); +INSERT INTO `sys_menu` VALUES ('1000015002', '1000015002', '', '修改用户分组', NULL, 0, '', NULL, '1000015', '8', '', 0, 2, 0, 'system:user-group:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2025-01-19 18:36:11'); 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 ('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` 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` 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` 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` VALUES ('1003', '1003', 'BpmManage', '流程中心', 'ant-design:project-outlined', NULL, '', NULL, NULL, '16', '/bpm', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` VALUES ('1003001', '1003001', 'DesignFlowDefinition', '流程设计', NULL, 0, '/bpm/flow/definition/index', NULL, '1003', '16', '/flow-definition', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` VALUES ('1003002', '1003002', 'MyFlow', '我的发起', NULL, 0, '/bpm/flow/task/my/index', NULL, '1003', '16', '/flow-my', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` VALUES ('1003003', '1003003', 'FlowTodo', '待办任务', NULL, 0, '/bpm/flow/task/todo/index', NULL, '1003', '16', '/flow-todo', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` VALUES ('1003004', '1003004', 'FlowInstanceManage', '流程实例管理', NULL, 0, '/bpm/flow/instance/manage/index', NULL, '1003', '16', '/flow-instance-manage', 0, 1, 0, '', 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'); @@ -5489,6 +5758,9 @@ INSERT INTO `sys_menu` VALUES ('2000009004', '2000009004', '', '导入地址', N 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 ('2000011', '2000011', 'PrintTemplate', '打印模板', NULL, 0, '/base-data/print-template/index', NULL, '2000', '15', '/print-template', 0, 1, 0, 'base-data:print-template:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` VALUES ('2000011001', '2000011001', '', '新增打印模板', NULL, 0, '', NULL, '2000011', '15', '', 0, 2, 0, 'base-data:print-template:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` VALUES ('2000011002', '2000011002', '', '修改打印模板', NULL, 0, '', NULL, '2000011', '15', '', 0, 2, 0, 'base-data:print-template: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'); @@ -5770,7 +6042,7 @@ CREATE TABLE `sys_notify_group` ( `available` tinyint(1) NOT NULL COMMENT '状态', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `name`(`name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息通知组' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息通知组' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_notify_group @@ -5786,7 +6058,7 @@ CREATE TABLE `sys_notify_group_receiver` ( `receiver_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '接收者ID', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `group_id`(`group_id`, `receiver_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息通知组-接收者关系表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息通知组-接收者关系表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_notify_group_receiver @@ -5836,6 +6108,7 @@ INSERT INTO `sys_parameter` VALUES (19, 'export.timeout', '600', '单个导出 DROP TABLE IF EXISTS `sys_role`; CREATE TABLE `sys_role` ( `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', `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 '权限', @@ -5849,13 +6122,37 @@ CREATE TABLE `sys_role` ( `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `name`(`name`) 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; -- ---------------------------- -- 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'); +INSERT INTO `sys_role` VALUES ('1', '1', '001', '系统管理员', 'admin', 1, '系统管理员', '系统管理员', '1', '2021-05-08 18:04:41', '系统管理员', '1', '2021-05-08 18:04:45'); + +-- ---------------------------- +-- Table structure for sys_role_category +-- ---------------------------- +DROP TABLE IF EXISTS `sys_role_category`; +CREATE TABLE `sys_role_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_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 '修改时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `code`(`code`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色分类' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of sys_role_category +-- ---------------------------- +INSERT INTO `sys_role_category` VALUES ('1', '001', '默认', '系统管理员', '1', '2025-05-12 00:00:00', '系统管理员', '1', '2025-05-12 00:00:00'); -- ---------------------------- -- Table structure for sys_role_menu @@ -5895,7 +6192,7 @@ CREATE TABLE `sys_site_message` ( INDEX `biz_key`(`biz_key`) USING BTREE, INDEX `receiver_id`(`receiver_id`) USING BTREE, INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '站内信' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '站内信' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_site_message @@ -5950,6 +6247,48 @@ CREATE TABLE `sys_user_dept` ( -- Records of sys_user_dept -- ---------------------------- +-- ---------------------------- +-- Table structure for sys_user_group +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user_group`; +CREATE TABLE `sys_user_group` ( + `id` varchar(20) 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 '名称', + `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 '修改时间', + `available` tinyint(1) NOT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `name`(`name`) USING BTREE, + UNIQUE INDEX `code`(`code`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户组' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of sys_user_group +-- ---------------------------- + +-- ---------------------------- +-- Table structure for sys_user_group_detail +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user_group_detail`; +CREATE TABLE `sys_user_group_detail` ( + `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', + `group_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户组ID', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `user_id, group_id`(`user_id`, `group_id`) USING BTREE, + INDEX `group_id`(`group_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与用户组关系表' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of sys_user_group_detail +-- ---------------------------- + -- ---------------------------- -- Table structure for sys_user_position -- ---------------------------- @@ -6027,7 +6366,7 @@ CREATE TABLE `tbl_export_task` ( INDEX `finish_time`(`finish_time`) USING BTREE, INDEX `req_params_sign`(`req_params_sign`) USING BTREE, INDEX `create_by_id`(`create_by_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '导出任务' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '导出任务' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of tbl_export_task @@ -6198,6 +6537,64 @@ CREATE TABLE `tbl_pre_take_stock_sheet_detail` ( -- Records of tbl_pre_take_stock_sheet_detail -- ---------------------------- +-- ---------------------------- +-- Table structure for tbl_print_template +-- ---------------------------- +DROP TABLE IF EXISTS `tbl_print_template`; +CREATE TABLE `tbl_print_template` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', + `template_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'JSON配置', + `demo_data` 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_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 '修改时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '打印模板' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of tbl_print_template +-- ---------------------------- +INSERT INTO `tbl_print_template` VALUES (1, '采购订单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"采购订单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"供应商编号-标题\",\"value\":\"供应商编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"供应商编号\",\"value\":\"{供应商编号}\",\"name\":\"supplierCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"供应商名称-标题\",\"value\":\"供应商名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"供应商名称\",\"value\":\"{供应商名称}\",\"name\":\"supplierName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"采购员-标题\",\"value\":\"采购员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"采购员\",\"value\":\"{采购员}\",\"name\":\"purchaserName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":118,\"title\":\"采购商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"采购数量\",\"value\":\"{采购数量}\",\"name\":\"purchaseNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"采购金额\",\"value\":\"{采购金额}\",\"name\":\"purchaseAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"采购数量\",\"value\":\"{采购数量}\",\"name\":\"purchaseNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"采购金额\",\"value\":\"{采购金额}\",\"name\":\"purchaseAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"purchaseNum\",\"purchasePrice\",\"purchaseAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"预计到货日期-标题\",\"value\":\"预计到货日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"预计到货日期\",\"value\":\"{预计到货日期}\",\"name\":\"expectArriveDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"}],\"title\":\"采购订单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202503220000000002\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"supplierCode\": \"1\",\n \"supplierName\": \"测试供应商\",\n \"purchaserName\": \"\",\n \"expectArriveDate\": \"2025-04-22\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-03-22 08:04:30\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"purchaseNum\": 1,\n \"purchasePrice\": 121,\n \"purchaseAmount\": 121\n }\n ]\n}', '系统管理员', '1', '2025-01-28 18:41:35', '系统管理员', '1', '2025-05-09 19:49:08'); +INSERT INTO `tbl_print_template` VALUES (2, '采购收货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"采购收货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"供应商编号-标题\",\"value\":\"供应商编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"供应商编号\",\"value\":\"{供应商编号}\",\"name\":\"supplierCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"供应商名称-标题\",\"value\":\"供应商名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"供应商名称\",\"value\":\"{供应商名称}\",\"name\":\"supplierName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"采购员-标题\",\"value\":\"采购员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"采购员\",\"value\":\"{采购员}\",\"name\":\"purchaserName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"收货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"收货数量\",\"value\":\"{收货数量}\",\"name\":\"receiveNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"收货金额\",\"value\":\"{收货金额}\",\"name\":\"receiveAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"收货数量\",\"value\":\"{收货数量}\",\"name\":\"receiveNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"收货金额\",\"value\":\"{收货金额}\",\"name\":\"receiveAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"receiveNum\",\"purchasePrice\",\"receiveAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":108,\"title\":\"实际到货日期-标题\",\"value\":\"实际到货日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"6dd07e667962904ffc295c2ebc5e75c164ad\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":108,\"title\":\"实际到货日期\",\"value\":\"{实际到货日期}\",\"name\":\"receiveDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"572db42f6ec9644a9c4863c94af8b229e6e8\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"采购订单号-标题\",\"value\":\"采购订单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a4e29827b8e062405258d7f5e7bb535f9dd5\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"采购订单号\",\"value\":\"{采购订单号}\",\"name\":\"purchaseOrderCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e7681d4c03d9664ad96b96efc49bd124f871\"}],\"title\":\"采购收货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"supplierCode\": \"1\",\n \"supplierName\": \"测试供应商\",\n \"purchaserName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"receiveDate\": \"2025-01-19\",\n \"purchaseOrderCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 21:39:08\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"receiveNum\": 1,\n \"purchasePrice\": 121,\n \"receiveAmount\": 121\n }\n ]\n}', '系统管理员', '1', '2025-01-28 18:44:12', '系统管理员', '1', '2025-05-09 18:04:40'); +INSERT INTO `tbl_print_template` VALUES (3, '采购退货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"采购退货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"供应商编号-标题\",\"value\":\"供应商编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"供应商编号\",\"value\":\"{供应商编号}\",\"name\":\"supplierCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"供应商名称-标题\",\"value\":\"供应商名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"供应商名称\",\"value\":\"{供应商名称}\",\"name\":\"supplierName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"采购员-标题\",\"value\":\"采购员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"采购员\",\"value\":\"{采购员}\",\"name\":\"purchaserName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"退货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"退货价\",\"value\":\"{退货价}\",\"name\":\"purchasePrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"退货价\",\"value\":\"{退货价}\",\"name\":\"purchasePrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"returnNum\",\"purchasePrice\",\"returnAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"采购收货单号-标题\",\"value\":\"采购收货单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a4e29827b8e062405258d7f5e7bb535f9dd5\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"采购收货单号\",\"value\":\"{采购收货单号}\",\"name\":\"receiveSheetCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e7681d4c03d9664ad96b96efc49bd124f871\"}],\"title\":\"采购退货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000005\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"supplierCode\": \"1\",\n \"supplierName\": \"测试供应商\",\n \"purchaserName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"receiveSheetCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 21:51:18\",\n \"approveBy\": \"系统管理员\",\n \"approveTime\": \"2025-01-19 21:51:24\",\n \"details\": [\n {\n \"id\": \"1880976328979779584\",\n \"productId\": \"1738409214449160192\",\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"returnNum\": 1,\n \"purchasePrice\": 121,\n \"returnAmount\": 121\n }\n ]\n}', '系统管理员', '1', '2025-05-09 18:03:12', '系统管理员', '1', '2025-05-09 19:45:12'); +INSERT INTO `tbl_print_template` VALUES (4, '零售出库单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"零售出库单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"会员编号-标题\",\"value\":\"会员编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"会员编号\",\"value\":\"{会员编号}\",\"name\":\"memberCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"会员名称-标题\",\"value\":\"会员名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"会员名称\",\"value\":\"{会员名称}\",\"name\":\"memberName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":118,\"title\":\"出库商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"outNum\",\"taxPrice\",\"outAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"}],\"title\":\"零售出库单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000004\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"memberCode\": \"1\",\n \"memberName\": \"测试会员\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:20:59\",\n \"approveBy\": \"系统管理员\",\n \"approveTime\": \"2025-01-19 22:21:23\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"outNum\": 1,\n \"taxPrice\": 141,\n \"outAmount\": 141\n }\n ]\n}', '系统管理员', '1', '2025-05-09 19:54:59', '系统管理员', '1', '2025-05-09 20:03:51'); +INSERT INTO `tbl_print_template` VALUES (5, '零售退货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"零售退货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"会员编号-标题\",\"value\":\"会员编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"会员编号\",\"value\":\"{会员编号}\",\"name\":\"memberCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"会员名称-标题\",\"value\":\"会员名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"会员名称\",\"value\":\"{会员名称}\",\"name\":\"memberName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"退货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"returnNum\",\"taxPrice\",\"returnAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"零售出库单号-标题\",\"value\":\"零售出库单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"10488b69c261764f0e388a6607267aae769f\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"零售出库单号\",\"value\":\"{零售出库单号}\",\"name\":\"outSheetCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"ba426c11fae59f4442a84d29ef5ab38c82ff\"}],\"title\":\"零售退货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"memberCode\": \"1\",\n \"memberName\": \"测试会员\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"outSheetCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:28:28\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"returnNum\": 1,\n \"taxPrice\": 141,\n \"returnAmount\": 141\n }\n ]\n}', '系统管理员', '1', '2025-05-09 20:54:00', '系统管理员', '1', '2025-05-09 21:03:49'); +INSERT INTO `tbl_print_template` VALUES (6, '销售订单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"销售订单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"客户编号-标题\",\"value\":\"客户编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"客户编号\",\"value\":\"{客户编号}\",\"name\":\"customerCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"客户名称-标题\",\"value\":\"客户名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"客户名称\",\"value\":\"{客户名称}\",\"name\":\"customerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":118,\"title\":\"销售商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"销售数量\",\"value\":\"{销售数量}\",\"name\":\"orderNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"销售金额\",\"value\":\"{销售金额}\",\"name\":\"orderAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"销售数量\",\"value\":\"{销售数量}\",\"name\":\"orderNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"销售金额\",\"value\":\"{销售金额}\",\"name\":\"orderAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"orderNum\",\"taxPrice\",\"orderAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"}],\"title\":\"零售出库单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"customerCode\": \"1\",\n \"customerName\": \"测试客户\",\n \"salerName\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:08:46\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"orderNum\": 1,\n \"taxPrice\": 131,\n \"orderAmount\": 131\n }\n ]\n}', '系统管理员', '1', '2025-05-09 22:34:50', '系统管理员', '1', '2025-05-09 22:35:00'); +INSERT INTO `tbl_print_template` VALUES (7, '销售出库单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"销售出库单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"客户编号-标题\",\"value\":\"客户编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"客户编号\",\"value\":\"{客户编号}\",\"name\":\"customerCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"客户名称-标题\",\"value\":\"客户名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"客户名称\",\"value\":\"{客户名称}\",\"name\":\"customerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"出库商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"outNum\",\"taxPrice\",\"outAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"销售订单号-标题\",\"value\":\"销售订单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a4e29827b8e062405258d7f5e7bb535f9dd5\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"销售订单号\",\"value\":\"{销售订单号}\",\"name\":\"saleOrderCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e7681d4c03d9664ad96b96efc49bd124f871\"}],\"title\":\"销售出库单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000004\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"customerCode\": \"1\",\n \"customerName\": \"测试客户\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"saleOrderCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:09:55\",\n \"approveBy\": \"系统管理员\",\n \"approveTime\": \"2025-01-19 22:10:01\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"outNum\": 1,\n \"taxPrice\": 131,\n \"outAmount\": 131\n }\n ]\n}', '系统管理员', '1', '2025-05-09 22:50:02', '系统管理员', '1', '2025-05-09 22:50:13'); +INSERT INTO `tbl_print_template` VALUES (8, '销售退货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"销售退货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"客户编号-标题\",\"value\":\"客户编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"客户编号\",\"value\":\"{客户编号}\",\"name\":\"customerCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"客户名称-标题\",\"value\":\"客户名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"客户名称\",\"value\":\"{客户名称}\",\"name\":\"customerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"退货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"returnNum\",\"taxPrice\",\"returnAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"销售出库单号-标题\",\"value\":\"销售出库单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"10488b69c261764f0e388a6607267aae769f\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"销售出库单号\",\"value\":\"{销售出库单号}\",\"name\":\"outSheetCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"ba426c11fae59f4442a84d29ef5ab38c82ff\"}],\"title\":\"销售退货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"customerCode\": \"1\",\n \"customerName\": \"测试客户\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"outSheetCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:10:44\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"returnNum\": 1,\n \"taxPrice\": 131,\n \"returnAmount\": 131\n }\n ]\n}', '系统管理员', '1', '2025-05-09 23:03:03', '系统管理员', '1', '2025-05-09 23:03:35'); + +-- ---------------------------- +-- Table structure for tbl_print_template_comp +-- ---------------------------- +DROP TABLE IF EXISTS `tbl_print_template_comp`; +CREATE TABLE `tbl_print_template_comp` ( + `id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', + `template_id` int(11) NOT NULL COMMENT '模板ID', + `comp_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组件配置', + PRIMARY KEY (`id`) USING BTREE, + INDEX `template_id`(`template_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '打印模板组件' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of tbl_print_template_comp +-- ---------------------------- +INSERT INTO `tbl_print_template_comp` VALUES ('1', 0, '{\"type\":\"braid-txt\"}'); +INSERT INTO `tbl_print_template_comp` VALUES ('100', 1, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"采购商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"采购数量\",\"value\":\"{采购数量}\",\"name\":\"purchaseNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"采购金额\",\"value\":\"{采购金额}\",\"name\":\"purchaseAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('101', 2, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"收货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"收货数量\",\"value\":\"{收货数量}\",\"name\":\"receiveNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"收货金额\",\"value\":\"{收货金额}\",\"name\":\"receiveAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('102', 3, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"退货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"退货价\",\"value\":\"{退货价}\",\"name\":\"purchasePrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('103', 4, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"出库商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('104', 5, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"退货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('105', 6, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"销售商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"销售数量\",\"value\":\"{销售数量}\",\"name\":\"orderNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"销售金额\",\"value\":\"{销售金额}\",\"name\":\"orderAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('106', 7, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"出库商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('107', 8, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"退货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` VALUES ('2', 0, '{\"type\":\"braid-page\"}'); +INSERT INTO `tbl_print_template_comp` VALUES ('3', 0, '{\"type\":\"braid-react\"}'); +INSERT INTO `tbl_print_template_comp` VALUES ('4', 0, '{\"type\":\"braid-barcode\"}'); + -- ---------------------------- -- Table structure for tbl_product_stock -- ---------------------------- @@ -6268,7 +6665,7 @@ CREATE TABLE `tbl_product_stock_warning` ( `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `sc_id`(`sc_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存预警' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存预警' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of tbl_product_stock_warning @@ -6283,7 +6680,7 @@ CREATE TABLE `tbl_product_stock_warning_notify` ( `notify_group_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '通知组ID', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `notify_group_id`(`notify_group_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存预警通知组' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存预警通知组' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of tbl_product_stock_warning_notify @@ -6295,6 +6692,9 @@ CREATE TABLE `tbl_product_stock_warning_notify` ( 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', + `purchase_require_bpm` tinyint(1) NOT NULL DEFAULT 0 COMMENT '采购订单是否开启审批流程', + `purchase_bpm_process_id` bigint(20) NULL DEFAULT NULL COMMENT '采购订单关联的审批流程ID', + `purchase_bpm_process_code` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购订单关联的审批流程编号', `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 '采购退货单是否关联采购收货单', @@ -6305,7 +6705,7 @@ CREATE TABLE `tbl_purchase_config` ( -- ---------------------------- -- Records of tbl_purchase_config -- ---------------------------- -INSERT INTO `tbl_purchase_config` VALUES ('1', 1, 1, 1, 1); +INSERT INTO `tbl_purchase_config` VALUES ('1', 0, NULL, NULL, 1, 1, 1, 1); -- ---------------------------- -- Table structure for tbl_purchase_order @@ -6332,11 +6732,13 @@ CREATE TABLE `tbl_purchase_order` ( `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `flow_instance_id` bigint(20) NULL DEFAULT NULL COMMENT '关联的审批流程ID', 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 + INDEX `create_time`(`create_time`) USING BTREE, + INDEX `flow_instance_id`(`flow_instance_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单' ROW_FORMAT = DYNAMIC; -- ---------------------------- @@ -6367,6 +6769,68 @@ CREATE TABLE `tbl_purchase_order_detail` ( -- Records of tbl_purchase_order_detail -- ---------------------------- +-- ---------------------------- +-- Table structure for tbl_purchase_order_detail_form +-- ---------------------------- +DROP TABLE IF EXISTS `tbl_purchase_order_detail_form`; +CREATE TABLE `tbl_purchase_order_detail_form` ( + `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', + `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 '备注', + `order_no` int(11) NOT NULL 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; + +-- ---------------------------- +-- Records of tbl_purchase_order_detail_form +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tbl_purchase_order_form +-- ---------------------------- +DROP TABLE IF EXISTS `tbl_purchase_order_form`; +CREATE TABLE `tbl_purchase_order_form` ( + `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_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 '审核时间', + `status` tinyint(3) NOT NULL COMMENT '状态', + `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `flow_instance_id` bigint(20) NULL DEFAULT NULL COMMENT '关联的审批流程ID', + 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, + INDEX `flow_instance_id`(`flow_instance_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of tbl_purchase_order_form +-- ---------------------------- + -- ---------------------------- -- Table structure for tbl_purchase_return -- ---------------------------- @@ -7075,7 +7539,7 @@ CREATE TABLE `tbl_security_upload_record` ( `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', `create_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 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全上传记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of tbl_security_upload_record diff --git a/xingyun-api/src/main/resources/db/migration/platform/V1.6__bpm.sql b/xingyun-api/src/main/resources/db/migration/platform/V1.6__bpm.sql new file mode 100644 index 0000000000000000000000000000000000000000..061ee01d647d072dc1c4e7a2aa8f887432ed0986 --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/platform/V1.6__bpm.sql @@ -0,0 +1,2 @@ +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (16, '审批流程', '管理审批流程。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1748649349774184463', 16, 1000, '2099-01-01 00:00:00'); \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.14__print_template.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.14__print_template.sql new file mode 100644 index 0000000000000000000000000000000000000000..a4576fd01458e10e89b7167c31c7412000ea5275 --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.14__print_template.sql @@ -0,0 +1,46 @@ +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000011', '2000011', 'PrintTemplate', '打印模板', NULL, 0, '/base-data/print-template/index', NULL, '2000', '15', '/print-template', 0, 1, 0, 'base-data:print-template: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 ('2000011001', '2000011001', '', '新增打印模板', NULL, 0, '', NULL, '2000011', '15', '', 0, 2, 0, 'base-data:print-template: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 ('2000011002', '2000011002', '', '修改打印模板', NULL, 0, '', NULL, '2000011', '15', '', 0, 2, 0, 'base-data:print-template:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); + +CREATE TABLE `tbl_print_template` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `template_json` longtext COMMENT 'JSON配置', + `demo_data` longtext 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 '修改时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COMMENT='打印模板'; + +CREATE TABLE `tbl_print_template_comp` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `template_id` int(11) NOT NULL COMMENT '模板ID', + `comp_json` longtext NOT NULL COMMENT '组件配置', + PRIMARY KEY (`id`), + KEY `template_id` (`template_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='打印模板组件'; + +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (1, '采购订单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"采购订单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"供应商编号-标题\",\"value\":\"供应商编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"供应商编号\",\"value\":\"{供应商编号}\",\"name\":\"supplierCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"供应商名称-标题\",\"value\":\"供应商名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"供应商名称\",\"value\":\"{供应商名称}\",\"name\":\"supplierName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"采购员-标题\",\"value\":\"采购员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"采购员\",\"value\":\"{采购员}\",\"name\":\"purchaserName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":118,\"title\":\"采购商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"采购数量\",\"value\":\"{采购数量}\",\"name\":\"purchaseNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"采购金额\",\"value\":\"{采购金额}\",\"name\":\"purchaseAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"采购数量\",\"value\":\"{采购数量}\",\"name\":\"purchaseNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"采购金额\",\"value\":\"{采购金额}\",\"name\":\"purchaseAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"purchaseNum\",\"purchasePrice\",\"purchaseAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"预计到货日期-标题\",\"value\":\"预计到货日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"预计到货日期\",\"value\":\"{预计到货日期}\",\"name\":\"expectArriveDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"}],\"title\":\"采购订单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202503220000000002\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"supplierCode\": \"1\",\n \"supplierName\": \"测试供应商\",\n \"purchaserName\": \"\",\n \"expectArriveDate\": \"2025-04-22\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-03-22 08:04:30\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"purchaseNum\": 1,\n \"purchasePrice\": 121,\n \"purchaseAmount\": 121\n }\n ]\n}', '系统管理员', '1', '2025-01-28 18:41:35', '系统管理员', '1', '2025-05-09 19:49:08'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (2, '采购收货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"采购收货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"供应商编号-标题\",\"value\":\"供应商编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"供应商编号\",\"value\":\"{供应商编号}\",\"name\":\"supplierCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"供应商名称-标题\",\"value\":\"供应商名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"供应商名称\",\"value\":\"{供应商名称}\",\"name\":\"supplierName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"采购员-标题\",\"value\":\"采购员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"采购员\",\"value\":\"{采购员}\",\"name\":\"purchaserName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"收货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"收货数量\",\"value\":\"{收货数量}\",\"name\":\"receiveNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"收货金额\",\"value\":\"{收货金额}\",\"name\":\"receiveAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"收货数量\",\"value\":\"{收货数量}\",\"name\":\"receiveNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"收货金额\",\"value\":\"{收货金额}\",\"name\":\"receiveAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"receiveNum\",\"purchasePrice\",\"receiveAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":108,\"title\":\"实际到货日期-标题\",\"value\":\"实际到货日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"6dd07e667962904ffc295c2ebc5e75c164ad\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":108,\"title\":\"实际到货日期\",\"value\":\"{实际到货日期}\",\"name\":\"receiveDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"572db42f6ec9644a9c4863c94af8b229e6e8\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"采购订单号-标题\",\"value\":\"采购订单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a4e29827b8e062405258d7f5e7bb535f9dd5\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"采购订单号\",\"value\":\"{采购订单号}\",\"name\":\"purchaseOrderCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e7681d4c03d9664ad96b96efc49bd124f871\"}],\"title\":\"采购收货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"supplierCode\": \"1\",\n \"supplierName\": \"测试供应商\",\n \"purchaserName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"receiveDate\": \"2025-01-19\",\n \"purchaseOrderCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 21:39:08\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"receiveNum\": 1,\n \"purchasePrice\": 121,\n \"receiveAmount\": 121\n }\n ]\n}', '系统管理员', '1', '2025-01-28 18:44:12', '系统管理员', '1', '2025-05-09 18:04:40'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (3, '采购退货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"采购退货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"供应商编号-标题\",\"value\":\"供应商编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"供应商编号\",\"value\":\"{供应商编号}\",\"name\":\"supplierCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"供应商名称-标题\",\"value\":\"供应商名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"供应商名称\",\"value\":\"{供应商名称}\",\"name\":\"supplierName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"采购员-标题\",\"value\":\"采购员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"采购员\",\"value\":\"{采购员}\",\"name\":\"purchaserName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"退货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"退货价\",\"value\":\"{退货价}\",\"name\":\"purchasePrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"退货价\",\"value\":\"{退货价}\",\"name\":\"purchasePrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"returnNum\",\"purchasePrice\",\"returnAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"采购收货单号-标题\",\"value\":\"采购收货单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a4e29827b8e062405258d7f5e7bb535f9dd5\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"采购收货单号\",\"value\":\"{采购收货单号}\",\"name\":\"receiveSheetCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e7681d4c03d9664ad96b96efc49bd124f871\"}],\"title\":\"采购退货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000005\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"supplierCode\": \"1\",\n \"supplierName\": \"测试供应商\",\n \"purchaserName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"receiveSheetCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 21:51:18\",\n \"approveBy\": \"系统管理员\",\n \"approveTime\": \"2025-01-19 21:51:24\",\n \"details\": [\n {\n \"id\": \"1880976328979779584\",\n \"productId\": \"1738409214449160192\",\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"returnNum\": 1,\n \"purchasePrice\": 121,\n \"returnAmount\": 121\n }\n ]\n}', '系统管理员', '1', '2025-05-09 18:03:12', '系统管理员', '1', '2025-05-09 19:45:12'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (4, '零售出库单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"零售出库单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"会员编号-标题\",\"value\":\"会员编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"会员编号\",\"value\":\"{会员编号}\",\"name\":\"memberCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"会员名称-标题\",\"value\":\"会员名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"会员名称\",\"value\":\"{会员名称}\",\"name\":\"memberName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":118,\"title\":\"出库商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"outNum\",\"taxPrice\",\"outAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"}],\"title\":\"零售出库单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000004\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"memberCode\": \"1\",\n \"memberName\": \"测试会员\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:20:59\",\n \"approveBy\": \"系统管理员\",\n \"approveTime\": \"2025-01-19 22:21:23\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"outNum\": 1,\n \"taxPrice\": 141,\n \"outAmount\": 141\n }\n ]\n}', '系统管理员', '1', '2025-05-09 19:54:59', '系统管理员', '1', '2025-05-09 20:03:51'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (5, '零售退货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"零售退货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"会员编号-标题\",\"value\":\"会员编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"会员编号\",\"value\":\"{会员编号}\",\"name\":\"memberCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"会员名称-标题\",\"value\":\"会员名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"会员名称\",\"value\":\"{会员名称}\",\"name\":\"memberName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"退货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"returnNum\",\"taxPrice\",\"returnAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"零售出库单号-标题\",\"value\":\"零售出库单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"10488b69c261764f0e388a6607267aae769f\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"零售出库单号\",\"value\":\"{零售出库单号}\",\"name\":\"outSheetCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"ba426c11fae59f4442a84d29ef5ab38c82ff\"}],\"title\":\"零售退货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"memberCode\": \"1\",\n \"memberName\": \"测试会员\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"outSheetCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:28:28\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"returnNum\": 1,\n \"taxPrice\": 141,\n \"returnAmount\": 141\n }\n ]\n}', '系统管理员', '1', '2025-05-09 20:54:00', '系统管理员', '1', '2025-05-09 21:03:49'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (6, '销售订单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"销售订单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"客户编号-标题\",\"value\":\"客户编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"客户编号\",\"value\":\"{客户编号}\",\"name\":\"customerCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"客户名称-标题\",\"value\":\"客户名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"客户名称\",\"value\":\"{客户名称}\",\"name\":\"customerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":118,\"title\":\"销售商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"销售数量\",\"value\":\"{销售数量}\",\"name\":\"orderNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"销售金额\",\"value\":\"{销售金额}\",\"name\":\"orderAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"销售数量\",\"value\":\"{销售数量}\",\"name\":\"orderNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"销售金额\",\"value\":\"{销售金额}\",\"name\":\"orderAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"orderNum\",\"taxPrice\",\"orderAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"}],\"title\":\"零售出库单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"customerCode\": \"1\",\n \"customerName\": \"测试客户\",\n \"salerName\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:08:46\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"orderNum\": 1,\n \"taxPrice\": 131,\n \"orderAmount\": 131\n }\n ]\n}', '系统管理员', '1', '2025-05-09 22:34:50', '系统管理员', '1', '2025-05-09 22:35:00'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (7, '销售出库单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"销售出库单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"客户编号-标题\",\"value\":\"客户编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"客户编号\",\"value\":\"{客户编号}\",\"name\":\"customerCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"客户名称-标题\",\"value\":\"客户名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"客户名称\",\"value\":\"{客户名称}\",\"name\":\"customerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"出库商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"outNum\",\"taxPrice\",\"outAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"销售订单号-标题\",\"value\":\"销售订单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a4e29827b8e062405258d7f5e7bb535f9dd5\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"销售订单号\",\"value\":\"{销售订单号}\",\"name\":\"saleOrderCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e7681d4c03d9664ad96b96efc49bd124f871\"}],\"title\":\"销售出库单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000004\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"customerCode\": \"1\",\n \"customerName\": \"测试客户\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"saleOrderCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:09:55\",\n \"approveBy\": \"系统管理员\",\n \"approveTime\": \"2025-01-19 22:10:01\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"outNum\": 1,\n \"taxPrice\": 131,\n \"outAmount\": 131\n }\n ]\n}', '系统管理员', '1', '2025-05-09 22:50:02', '系统管理员', '1', '2025-05-09 22:50:13'); +INSERT INTO `tbl_print_template` (`id`, `name`, `template_json`, `demo_data`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (8, '销售退货单', '{\"tempItems\":[{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":122,\"height\":14,\"left\":500,\"top\":5,\"title\":\"标题\",\"value\":\"销售退货单\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":14,\"FontColor\":\"#000000\",\"Bold\":\"1\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"center\",\"ItemType\":\"1\",\"bordered\":false,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":0,\"leftOffset\":0},\"uuid\":\"35205865ddd83246b7aa9b82addbc49b5a7e\"},{\"type\":\"braid-barcode\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":200,\"height\":40,\"left\":920,\"top\":5,\"title\":\"单号条码\",\"name\":\"code\",\"style\":{\"zIndex\":0,\"FontSize\":\"9\",\"ShowBarText\":\"1\",\"CodeType\":\"Code39\",\"ItemType\":\"1\"},\"value\":\"{单号}\",\"uuid\":\"027597a790715443beeae5d06cd8d1f06b60\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":60,\"title\":\"仓库编号-标题\",\"value\":\"仓库编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"387f44812bf5e84fc2a89b8689beb7ae95ff\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":60,\"title\":\"仓库编号\",\"value\":\"{仓库编号}\",\"name\":\"scCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"b7217c3c1571794c4428f5d5823bfb0a4a99\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":60,\"title\":\"仓库名称-标题\",\"value\":\"仓库名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"a400e796d4c955457bc819f8cf6c43d6c19a\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":60,\"title\":\"仓库名称\",\"value\":\"{仓库名称}\",\"name\":\"scName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"7cf2034a2a4e1b443ffa3d5972bfc322a88e\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":60,\"title\":\"客户编号-标题\",\"value\":\"客户编号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09bc7fd608d8e641df48b4e94b47f05ff923\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":60,\"title\":\"客户编号\",\"value\":\"{客户编号}\",\"name\":\"customerCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"4a08de3bd8296a4ac6ab9f2c5cab79f61584\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":60,\"title\":\"客户名称-标题\",\"value\":\"客户名称：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"2bcbd47062dffb4d0038afc6ac3e58455eab\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":60,\"title\":\"客户名称\",\"value\":\"{客户名称}\",\"name\":\"customerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"c39584ca3946284d908bd758d6dad5a70517\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":84,\"title\":\"销售员-标题\",\"value\":\"销售员：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"4c9ba4c9e0da3443d2097761f206563a6e31\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":84,\"title\":\"销售员\",\"value\":\"{销售员}\",\"name\":\"salerName\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"a4508027b5bd034c440a063e59b7ee0cc297\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":286,\"top\":84,\"title\":\"操作人-标题\",\"value\":\"操作人：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"09debe4c6886374dbdd847de695a364339aa\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":394,\"top\":84,\"title\":\"操作人\",\"value\":\"{操作人}\",\"name\":\"createBy\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"aea91c8a37984b4d90e8545fa84a823a9e2b\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":562,\"top\":84,\"title\":\"操作时间-标题\",\"value\":\"操作时间：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"b80a43b94128624c56a97c3e88689b6af8d6\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":670,\"top\":84,\"title\":\"操作时间\",\"value\":\"{操作时间}\",\"name\":\"createTime\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"89d3b43387c17e44f798ef2bf220d26bf3e3\"},{\"type\":\"braid-table\",\"isEdit\":0,\"draggable\":true,\"resizable\":true,\"width\":1104,\"height\":60,\"left\":10,\"top\":142,\"title\":\"退货商品明细\",\"value\":\"{details}\",\"defaultValue\":[],\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"selectCol\":[\"_seq\",\"productCode\",\"productName\",\"skuCode\",\"externalCode\",\"returnNum\",\"taxPrice\",\"returnAmount\"],\"name\":\"details\",\"style\":{\"zIndex\":0,\"Alignment\":\"left\",\"FontSize\":12,\"FontColor\":\"#000000\",\"borderColor\":\"#000000\",\"autoHeight\":true,\"BottomMargin\":20},\"uuid\":\"a54b8d97a637b64fd5f9ca417d7d5211716e\"},{\"type\":\"braid-page\",\"isEdit\":false,\"draggable\":true,\"resizable\":true,\"width\":97,\"height\":20,\"left\":1025,\"top\":770,\"title\":\"分页\",\"curPageStyle\":\"第##页\",\"splitPageStyle\":\"/\",\"totalPageStyle\":\"共##页\",\"name\":\"\",\"style\":{\"zIndex\":0,\"ItemType\":\"1\",\"autoHeight\":false,\"BottomMargin\":5,\"Alignment\":\"right\",\"FontSize\":12,\"FontColor\":\"#000000\"},\"uuid\":\"d6f62ce0a7931e438188be50bc350f99da7d\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":10,\"top\":108,\"title\":\"付款日期-标题\",\"value\":\"付款日期：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"604209e64d1a984bbaabe0ad64ad77f5eeee\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":118,\"top\":108,\"title\":\"付款日期\",\"value\":\"{付款日期}\",\"name\":\"paymentDate\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"e874b94582286747e2a8865a0ded60b4d639\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":108,\"height\":24,\"left\":838,\"top\":84,\"title\":\"销售出库单号-标题\",\"value\":\"销售出库单号：\",\"name\":\"\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"right\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":0},\"uuid\":\"10488b69c261764f0e388a6607267aae769f\"},{\"type\":\"braid-txt\",\"isEdit\":1,\"draggable\":true,\"resizable\":true,\"width\":168,\"height\":24,\"left\":946,\"top\":84,\"title\":\"销售出库单号\",\"value\":\"{销售出库单号}\",\"name\":\"outSheetCode\",\"style\":{\"zIndex\":0,\"FontSize\":12,\"FontColor\":\"#000000\",\"Bold\":\"0\",\"Italic\":\"0\",\"Underline\":\"0\",\"Alignment\":\"left\",\"ItemType\":\"1\",\"bordered\":true,\"intLineStyle\":0,\"intLineWidth\":1,\"topOffset\":4,\"leftOffset\":5},\"uuid\":\"ba426c11fae59f4442a84d29ef5ab38c82ff\"}],\"title\":\"销售退货单\",\"pageWidth\":210,\"pageHeight\":297,\"width\":1122,\"height\":793,\"pageDirection\":2}', '{\n \"code\": \"202501190000000003\",\n \"scCode\": \"1\",\n \"scName\": \"测试仓库\",\n \"customerCode\": \"1\",\n \"customerName\": \"测试客户\",\n \"salerName\": \"\",\n \"paymentDate\": \"2025-02-19\",\n \"outSheetCode\": \"\",\n \"description\": \"\",\n \"createBy\": \"系统管理员\",\n \"createTime\": \"2025-01-19 22:10:44\",\n \"approveBy\": \"\",\n \"approveTime\": \"\",\n \"details\": [\n {\n \"productCode\": \"11\",\n \"productName\": \"商品222\",\n \"skuCode\": \"41\",\n \"externalCode\": \"51\",\n \"returnNum\": 1,\n \"taxPrice\": 131,\n \"returnAmount\": 131\n }\n ]\n}', '系统管理员', '1', '2025-05-09 23:03:03', '系统管理员', '1', '2025-05-09 23:03:35'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('1', 0, '{\"type\":\"braid-txt\"}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('100', 1, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"采购商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"采购数量\",\"value\":\"{采购数量}\",\"name\":\"purchaseNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"采购金额\",\"value\":\"{采购金额}\",\"name\":\"purchaseAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('101', 2, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"收货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"收货数量\",\"value\":\"{收货数量}\",\"name\":\"receiveNum\"},{\"title\":\"采购价\",\"value\":\"{采购价}\",\"name\":\"purchasePrice\"},{\"title\":\"收货金额\",\"value\":\"{收货金额}\",\"name\":\"receiveAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('102', 3, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"退货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"退货价\",\"value\":\"{退货价}\",\"name\":\"purchasePrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('103', 4, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"出库商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('104', 5, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"退货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('105', 6, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"销售商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"销售数量\",\"value\":\"{销售数量}\",\"name\":\"orderNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"销售金额\",\"value\":\"{销售金额}\",\"name\":\"orderAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('106', 7, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"出库商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"出库数量\",\"value\":\"{出库数量}\",\"name\":\"outNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"出库金额\",\"value\":\"{出库金额}\",\"name\":\"outAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('107', 8, '{\"type\":\"braid-table\",\"isEdit\":0,\"title\":\"退货商品明细\",\"name\":\"details\",\"value\":\"{details}\",\"style\":{},\"tabelHtml\":\"\",\"columnsAttr\":[{\"title\":\"序号\",\"name\":\"_seq\"},{\"title\":\"商品编号\",\"value\":\"{商品编号}\",\"name\":\"productCode\"},{\"title\":\"商品名称\",\"value\":\"{商品名称}\",\"name\":\"productName\"},{\"title\":\"商品SKU编号\",\"value\":\"{商品SKU编号}\",\"name\":\"skuCode\"},{\"title\":\"商品简码\",\"value\":\"{商品简码}\",\"name\":\"externalCode\"},{\"title\":\"退货数量\",\"value\":\"{退货数量}\",\"name\":\"returnNum\"},{\"title\":\"价格\",\"value\":\"{价格}\",\"name\":\"taxPrice\"},{\"title\":\"退货金额\",\"value\":\"{退货金额}\",\"name\":\"returnAmount\"}],\"columns\":[]}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('2', 0, '{\"type\":\"braid-page\"}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('3', 0, '{\"type\":\"braid-react\"}'); +INSERT INTO `tbl_print_template_comp` (`id`, `template_id`, `comp_json`) VALUES ('4', 0, '{\"type\":\"braid-barcode\"}'); diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.15__sys_role_category.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.15__sys_role_category.sql new file mode 100644 index 0000000000000000000000000000000000000000..a2a0c81f57bc72739d50de9e72e0f454ef849dd2 --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.15__sys_role_category.sql @@ -0,0 +1,21 @@ +ALTER TABLE `sys_role` + ADD COLUMN `category_id` varchar(32) NOT NULL COMMENT '分类ID' AFTER `id`; +ALTER TABLE `sys_role` + ADD INDEX `category_id`(`category_id`) USING BTREE; +UPDATE sys_role SET category_id = '1'; + +CREATE TABLE `sys_role_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) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色分类'; + +INSERT INTO `sys_role_category` (`id`, `code`, `name`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1', '001', '默认', '系统管理员', '1', '2025-05-12 00:00:00', '系统管理员', '1', '2025-05-12 00:00:00'); diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.16__user_group.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.16__user_group.sql new file mode 100644 index 0000000000000000000000000000000000000000..0be2149364009d376646dedb183bcc335a1b58fa --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.16__user_group.sql @@ -0,0 +1,30 @@ +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000015', '1000015', 'UserGroup', '用户分组', NULL, 0, '/system/user-group/index', NULL, '1000', '2', '/user-group', 0, 1, 0, 'system:user-group:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2025-01-19 18:36:11'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000015001', '1000015001', '', '新增用户分组', NULL, 0, '', NULL, '1000015', '8', '', 0, 2, 0, 'system:user-group:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2025-01-19 18:36:11'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000015002', '1000015002', '', '修改用户分组', NULL, 0, '', NULL, '1000015', '8', '', 0, 2, 0, 'system:user-group:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2025-01-19 18:36:11'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (99, '通用编号', '[{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"9dfa3174afa0464794e98e19ad7bb121ef24\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (11, '用户分组编号', '[{\"type\":1,\"pattern\":\"yyMMdd\"},{\"type\":3,\"key\":\"4bf9dafec322744f1f08bdf2d2569076a4d7\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +CREATE TABLE `sys_user_group` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) 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`), + UNIQUE KEY `code` (`code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户组'; + +CREATE TABLE `sys_user_group_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `user_id` varchar(32) NOT NULL COMMENT '用户ID', + `group_id` varchar(32) NOT NULL COMMENT '用户组ID', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `user_id, group_id` (`user_id`,`group_id`) USING BTREE, + KEY `group_id` (`group_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户与用户组关系表'; \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.17__bpm.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.17__bpm.sql new file mode 100644 index 0000000000000000000000000000000000000000..28aeb0114d17ce0c40ef517b5e39830bbae7f1b5 --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.17__bpm.sql @@ -0,0 +1,251 @@ +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1003', '1003', 'BpmManage', '流程中心', 'ant-design:project-outlined', NULL, '', NULL, NULL, '16', '/bpm', 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 ('1003001', '1003001', 'DesignFlowDefinition', '流程设计', NULL, 0, '/bpm/flow/definition/index', NULL, '1003', '16', '/flow-definition', 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 ('1003002', '1003002', 'MyFlow', '我的发起', NULL, 0, '/bpm/flow/task/my/index', NULL, '1003', '16', '/flow-my', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); + +CREATE TABLE `flow_definition` +( + `id` bigint NOT NULL COMMENT '主键id', + `flow_code` varchar(40) NOT NULL COMMENT '流程编码', + `flow_name` varchar(100) NOT NULL COMMENT '流程名称', + `category` varchar(100) DEFAULT NULL COMMENT '流程类别', + `version` varchar(20) NOT NULL COMMENT '流程版本', + `is_publish` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否发布（0未发布 1已发布 9失效）', + `form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径', + `activity_status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）', + `listener_type` varchar(100) DEFAULT NULL COMMENT '监听器类型', + `listener_path` varchar(400) DEFAULT NULL COMMENT '监听器路径', + `ext` varchar(500) DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB COMMENT ='流程定义表'; + +CREATE TABLE `flow_node` +( + `id` bigint NOT NULL COMMENT '主键id', + `node_type` tinyint(1) NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `definition_id` bigint NOT NULL COMMENT '流程定义id', + `node_code` varchar(100) NOT NULL COMMENT '流程节点编码', + `node_name` varchar(100) DEFAULT NULL COMMENT '流程节点名称', + `permission_flag` varchar(200) DEFAULT NULL COMMENT '权限标识（权限类型:权限标识，可以多个，用@@隔开)', + `node_ratio` decimal(6, 3) DEFAULT NULL COMMENT '流程签署比例值', + `coordinate` varchar(100) DEFAULT NULL COMMENT '坐标', + `any_node_skip` varchar(100) DEFAULT NULL COMMENT '任意结点跳转', + `listener_type` varchar(100) DEFAULT NULL COMMENT '监听器类型', + `listener_path` varchar(400) DEFAULT NULL COMMENT '监听器路径', + `handler_type` varchar(100) DEFAULT NULL COMMENT '处理器类型', + `handler_path` varchar(400) DEFAULT NULL COMMENT '处理器路径', + `form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径', + `version` varchar(20) NOT NULL COMMENT '版本', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `ext` text COMMENT '扩展属性', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB COMMENT ='流程节点表'; + +CREATE TABLE `flow_skip` +( + `id` bigint NOT NULL COMMENT '主键id', + `definition_id` bigint NOT NULL COMMENT '流程定义id', + `now_node_code` varchar(100) NOT NULL COMMENT '当前流程节点的编码', + `now_node_type` tinyint(1) DEFAULT NULL COMMENT '当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `next_node_code` varchar(100) NOT NULL COMMENT '下一个流程节点的编码', + `next_node_type` tinyint(1) DEFAULT NULL COMMENT '下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `skip_name` varchar(100) DEFAULT NULL COMMENT '跳转名称', + `skip_type` varchar(40) DEFAULT NULL COMMENT '跳转类型（PASS审批通过 REJECT退回）', + `skip_condition` varchar(200) DEFAULT NULL COMMENT '跳转条件', + `coordinate` varchar(100) DEFAULT NULL COMMENT '坐标', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB COMMENT ='节点跳转关联表'; + +CREATE TABLE `flow_instance` +( + `id` bigint NOT NULL COMMENT '主键id', + `definition_id` bigint NOT NULL COMMENT '对应flow_definition表的id', + `business_id` varchar(40) NOT NULL COMMENT '业务id', + `node_type` tinyint(1) NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `node_code` varchar(40) NOT NULL COMMENT '流程节点编码', + `node_name` varchar(100) DEFAULT NULL COMMENT '流程节点名称', + `variable` text COMMENT '任务变量', + `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `activity_status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）', + `def_json` text COMMENT '流程定义json', + `create_by` varchar(64) DEFAULT '' COMMENT '创建者', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `ext` varchar(500) DEFAULT NULL COMMENT '扩展字段，预留给业务系统使用', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB COMMENT ='流程实例表'; + +CREATE TABLE `flow_task` +( + `id` bigint NOT NULL COMMENT '主键id', + `definition_id` bigint NOT NULL COMMENT '对应flow_definition表的id', + `instance_id` bigint NOT NULL COMMENT '对应flow_instance表的id', + `node_code` varchar(100) NOT NULL COMMENT '节点编码', + `node_name` varchar(100) DEFAULT NULL COMMENT '节点名称', + `node_type` tinyint(1) NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB COMMENT ='待办任务表'; + +CREATE TABLE `flow_his_task` +( + `id` bigint(20) NOT NULL COMMENT '主键id', + `definition_id` bigint(20) NOT NULL COMMENT '对应flow_definition表的id', + `instance_id` bigint(20) NOT NULL COMMENT '对应flow_instance表的id', + `task_id` bigint(20) NOT NULL COMMENT '对应flow_task表的id', + `node_code` varchar(100) DEFAULT NULL COMMENT '开始节点编码', + `node_name` varchar(100) DEFAULT NULL COMMENT '开始节点名称', + `node_type` tinyint(1) DEFAULT NULL COMMENT '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', + `target_node_code` varchar(200) DEFAULT NULL COMMENT '目标节点编码', + `target_node_name` varchar(200) DEFAULT NULL COMMENT '结束节点名称', + `approver` varchar(40) DEFAULT NULL COMMENT '审批者', + `cooperate_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)', + `collaborator` varchar(40) DEFAULT NULL COMMENT '协作人', + `skip_type` varchar(10) NOT NULL COMMENT '流转类型（PASS通过 REJECT退回 NONE无动作）', + `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', + `form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径', + `message` varchar(500) DEFAULT NULL COMMENT '审批意见', + `variable` TEXT DEFAULT NULL COMMENT '任务变量', + `ext` TEXT DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串', + `create_time` datetime DEFAULT NULL COMMENT '任务开始时间', + `update_time` datetime DEFAULT NULL COMMENT '审批完成时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB COMMENT ='历史任务记录表'; + + +CREATE TABLE `flow_user` +( + `id` bigint NOT NULL COMMENT '主键id', + `type` char(1) NOT NULL COMMENT '人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3待办任务的委托人权限）', + `processed_by` varchar(80) DEFAULT NULL COMMENT '权限人', + `associated` bigint NOT NULL COMMENT '任务表id', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(80) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标志', + `tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE, + KEY `user_processed_type` (`processed_by`, `type`), + KEY `user_associated` (`associated`) USING BTREE +) ENGINE = InnoDB COMMENT ='流程用户表'; + +ALTER TABLE `tbl_purchase_config` + ADD COLUMN `purchase_require_bpm` tinyint(1) NOT NULL DEFAULT 0 COMMENT '采购订单是否开启审批流程' AFTER `id`, +ADD COLUMN `purchase_bpm_process_id` bigint(20) NULL COMMENT '采购订单关联的审批流程ID' AFTER `purchase_require_bpm`, +ADD COLUMN `purchase_bpm_process_code` varchar(200) NULL COMMENT '采购订单关联的审批流程编号' AFTER `purchase_bpm_process_id`; + +CREATE TABLE `tbl_purchase_order_form` ( + `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) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT 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) DEFAULT NULL COMMENT '拒绝原因', + `flow_instance_id` bigint(20) DEFAULT NULL COMMENT '关联的审批流程ID', + PRIMARY KEY (`id`) USING BTREE, + 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, + KEY `flow_instance_id` (`flow_instance_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购订单'; + +CREATE TABLE `tbl_purchase_order_detail_form` ( + `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) DEFAULT NULL COMMENT '备注', + `order_no` int(11) NOT NULL COMMENT '排序编号', + `receive_num` int(11) NOT NULL DEFAULT '0' COMMENT '已收货数量', + PRIMARY KEY (`id`) USING BTREE, + KEY `order_id` (`order_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购订单明细'; + +CREATE TABLE `flow_cu_instance` ( + `id` bigint(20) NOT NULL COMMENT 'ID', + `title` varchar(200) NOT NULL COMMENT '标题', + `biz_type` varchar(100) NULL COMMENT '业务类型', + `biz_flag` varchar(100) NULL COMMENT '业务标识', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='流程实例扩展表'; + +ALTER TABLE `tbl_purchase_order` + ADD COLUMN `flow_instance_id` bigint(20) NULL COMMENT '关联的审批流程ID' AFTER `refuse_reason`, +ADD INDEX `flow_instance_id`(`flow_instance_id`) USING BTREE; + +ALTER TABLE `flow_definition` + MODIFY COLUMN `is_publish` tinyint(3) NOT NULL DEFAULT 0 COMMENT '是否发布（0未发布 1已发布 9失效）' AFTER `version`, + MODIFY COLUMN `activity_status` tinyint(3) NOT NULL DEFAULT 1 COMMENT '流程激活状态（0挂起 1激活）' AFTER `form_path`; + +CREATE TABLE `flow_cu_approve_his` ( + `id` bigint(20) NOT NULL COMMENT 'ID', + `definition_id` bigint(20) NOT NULL COMMENT '流程定义ID', + `instance_id` bigint(20) NOT NULL COMMENT '流程实例ID', + `node_code` varchar(100) NOT NULL COMMENT '节点编码', + `node_name` varchar(100) NOT NULL COMMENT '节点名称', + `task_id` bigint(20) 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 '创建时间', + `message` varchar(500) DEFAULT NULL COMMENT '说明', + `skip_type` tinyint(3) NOT NULL COMMENT '审核类型', + PRIMARY KEY (`id`), + KEY `definition_id` (`definition_id`), + KEY `instance_id` (`instance_id`), + KEY `task_id` (`task_id`), + KEY `node_code` (`node_code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='流程审核历史'; +CREATE TABLE `flow_cu_category` ( + `id` varchar(32) COLLATE utf8_bin NOT NULL COMMENT 'ID', + `name` varchar(100) COLLATE utf8_bin NOT NULL COMMENT '名称', + `parent_id` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT '父级ID', + PRIMARY KEY (`id`) USING BTREE, + KEY `parent_id` (`parent_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT COMMENT='流程分类'; +ALTER TABLE `flow_cu_instance` + ADD COLUMN `start_time` datetime NOT NULL COMMENT '发起时间' AFTER `biz_flag`, +ADD COLUMN `end_time` datetime NULL COMMENT '结束时间' AFTER `start_time`; +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1003003', '1003003', 'FlowTodo', '待办任务', NULL, 0, '/bpm/flow/task/todo/index', NULL, '1003', '16', '/flow-todo', 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 ('1003004', '1003004', 'FlowInstanceManage', '流程实例管理', NULL, 0, '/bpm/flow/instance/manage/index', NULL, '1003', '16', '/flow-instance-manage', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); diff --git a/xingyun-basedata/pom.xml b/xingyun-basedata/pom.xml index af19a3d1bd0bc390160a6e656e22a42650973b80..25fbfc1eb3e917a732b7c8377c7f6269a355c5fd 100644 --- a/xingyun-basedata/pom.xml +++ b/xingyun-basedata/pom.xml @@ -17,9 +17,5 @@ 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 cdc88c0e8dea965f5fc39ba4924d10e42fabceaa..0d22aea053675f1f3a930b672372af2e8aea1d44 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 @@ -1,12 +1,12 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 8c4eaf0448bf5b390806cc4781934ca32580b5f3..7f21f0522a514057e9be0cb4b0cb06629b3509ec 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 @@ -1,8 +1,8 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; @@ -15,8 +15,8 @@ import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.shop.ShopService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 028231b51ad77b3d18d2db96250108453d9ebf2d..8f673b14ef2d008118be5e3b63b428345d141af4 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 @@ -1,8 +1,8 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; @@ -15,8 +15,8 @@ import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.shop.ShopService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/CustomerSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/CustomerSelectorBo.java index 1453d3cc58fa802abbb704e4b7adef89541fc18c..8d3a959adfbae6d973944b8a05c7b93ef5e8ceaf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/CustomerSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/CustomerSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.customer; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Customer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 b2c63f717fb1a22d337e95fc402136f4eac74248..f85f014d42c6a52483ca6eaf4dae73b398616d78 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 @@ -2,11 +2,11 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.stream.Collectors; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/QueryCustomerBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/QueryCustomerBo.java index 365fbd4e2988ba21b7e61b7e6876e53d938b46b1..0fca47b7221d1dd209f91f49356ef86a628f5619 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/QueryCustomerBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/QueryCustomerBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.customer; 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.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Customer; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; 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 e4a30e0b7bb4b1e13548e72d952e2b6563710b55..b4dac9fa7a051dad88b71f5a0b99070ef0335c7f 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 @@ -2,11 +2,11 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.stream.Collectors; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/LogisticsCompanySelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/LogisticsCompanySelectorBo.java index 714fcb94e4d4af86d85adfede4822dd095cf91ff..041cad6d5d8bd9c48e4e58ff99609b4541cc2ebd 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/LogisticsCompanySelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/LogisticsCompanySelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.logistics.company; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/QueryLogisticsCompanyBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/QueryLogisticsCompanyBo.java index cb7601994827bab46a592ce4832eccf955c934a5..c99c76e80edf955bd730710c5d1ba24f62c69562 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/QueryLogisticsCompanyBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/QueryLogisticsCompanyBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.logistics.company; 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.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; 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 765026c3764a4cadf7ccb1544d8afff11510e980..cc7d2375b1b7ddfd04f358e3da4da6d2f4592d06 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 @@ -3,13 +3,13 @@ package com.lframework.xingyun.basedata.bo.member; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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.inner.entity.SysUser; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/MemberSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/MemberSelectorBo.java index 734bf7f1dfba911374025240b4fc3fddc70ea0ad..be69191826c34d44428e61e4975b7920d4cb1df0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/MemberSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/MemberSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.member; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Member; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/QueryMemberBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/QueryMemberBo.java index 9a4f3871d16d8288a5be9e31f1e70055f35f7820..4559861b89d1e899e80e2903224f86605d45df4d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/QueryMemberBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/QueryMemberBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.member; 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.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Member; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/GetPayTypeBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/GetPayTypeBo.java index 03efdf901e3a445b75b644580f9107a38b3593d4..5743daeb9b940edb51675846326d9d2ec4ced7a3 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/GetPayTypeBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/GetPayTypeBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.paytype; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.PayType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/PayTypeSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/PayTypeSelectorBo.java index 215e7b6a67afe2b45b0616cddd33eae9124ebf09..3b2589147dcf7f944c6e9e188baa05ffdb649eaf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/PayTypeSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/PayTypeSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.paytype; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.PayType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/QueryPayTypeBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/QueryPayTypeBo.java index f869efa1b592fcdb33fa4056804661377cc7a153..c68251cf0ce4ff6a5de0b169b9d2c91d49774a05 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/QueryPayTypeBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/paytype/QueryPayTypeBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.paytype; 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.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.PayType; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateBo.java similarity index 40% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateBo.java index b52a5ef4cf0b4cbd42bbf18e068169367d0a3293..38496d874d731e4247a22da93260adfb13e77fb9 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateBo.java @@ -1,13 +1,12 @@ -package com.lframework.xingyun.template.gen.vo.custom.page; +package com.lframework.xingyun.basedata.bo.print; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.xingyun.basedata.entity.PrintTemplate; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class GenCustomPageSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; +public class GetPrintTemplateBo extends BaseBo { /** * ID @@ -21,9 +20,12 @@ public class GenCustomPageSelectorVo extends PageVo { @ApiModelProperty("名称") private String name; - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; + public GetPrintTemplateBo() { + + } + + public GetPrintTemplateBo(PrintTemplate dto) { + + super(dto); + } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateCompSettingBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateCompSettingBo.java new file mode 100644 index 0000000000000000000000000000000000000000..a717e55a7393d825e84b36fec6560b344c6e8635 --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateCompSettingBo.java @@ -0,0 +1,43 @@ +package com.lframework.xingyun.basedata.bo.print; + +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.xingyun.basedata.entity.PrintTemplateComp; +import io.swagger.annotations.ApiModelProperty; +import java.util.Map; +import lombok.Data; + +@Data +public class GetPrintTemplateCompSettingBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 组件配置 + */ + @ApiModelProperty("组件配置") + private Map compJson; + + public GetPrintTemplateCompSettingBo() { + + } + + public GetPrintTemplateCompSettingBo(PrintTemplateComp dto) { + + super(dto); + } + + @Override + public BaseBo convert(PrintTemplateComp dto) { + return super.convert(dto, GetPrintTemplateCompSettingBo::getCompJson); + } + + @Override + protected void afterInit(PrintTemplateComp dto) { + this.compJson = JsonUtil.parseMap(dto.getCompJson(), String.class, Object.class); + } +} diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateSettingBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateSettingBo.java new file mode 100644 index 0000000000000000000000000000000000000000..c30193d23f1b49bae24557201b26e40bf1eed1f0 --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/GetPrintTemplateSettingBo.java @@ -0,0 +1,71 @@ +package com.lframework.xingyun.basedata.bo.print; + +import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.xingyun.basedata.entity.PrintTemplate; +import com.lframework.xingyun.basedata.service.print.PrintTemplateCompService; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import lombok.Data; + +@Data +public class GetPrintTemplateSettingBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private Integer id; + + /** + * JSON配置 + */ + @ApiModelProperty("JSON配置") + private Map templateJson; + + /** + * 示例数据 + */ + @ApiModelProperty("示例数据") + private Map demoData; + + /** + * 附加组件配置 + */ + @ApiModelProperty("附加组件配置") + private List> compJsonList; + + public GetPrintTemplateSettingBo() { + + } + + public GetPrintTemplateSettingBo(PrintTemplate dto) { + + super(dto); + } + + @Override + public BaseBo convert(PrintTemplate dto) { + return super.convert(dto, GetPrintTemplateSettingBo::getTemplateJson, + GetPrintTemplateSettingBo::getDemoData); + } + + @Override + protected void afterInit(PrintTemplate dto) { + this.templateJson = JsonUtil.parseMap(dto.getTemplateJson(), String.class, Object.class); + + if (!StringUtil.isBlank(dto.getDemoData())) { + this.demoData = JsonUtil.parseMap(dto.getDemoData(), String.class, Object.class); + } + + PrintTemplateCompService printTemplateCompService = ApplicationUtil.getBean( + PrintTemplateCompService.class); + List compJsonList = printTemplateCompService.getCompJsonByTemplateId(dto.getId()); + this.compJsonList = compJsonList.stream() + .map(t -> JsonUtil.parseMap(t, String.class, Object.class)).collect(Collectors.toList()); + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/QueryPrintTemplateBo.java similarity index 55% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/QueryPrintTemplateBo.java index ca78fcc4bc0f7fab0df0e580d39f108f9b2087dd..6cb7e752691534f16a2b8655872e0edf642db891 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/print/QueryPrintTemplateBo.java @@ -1,27 +1,21 @@ -package com.lframework.xingyun.template.inner.bo.system.role; +package com.lframework.xingyun.basedata.bo.print; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.xingyun.basedata.entity.PrintTemplate; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; @Data -public class QuerySysRoleBo extends BaseBo { +public class QueryPrintTemplateBo extends BaseBo { /** * ID */ @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; + private Integer id; /** * 名称 @@ -29,24 +23,6 @@ public class QuerySysRoleBo extends BaseBo { @ApiModelProperty("名称") private String name; - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - /** * 创建人 */ @@ -73,16 +49,12 @@ public class QuerySysRoleBo extends BaseBo { @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) private LocalDateTime updateTime; - public QuerySysRoleBo() { + public QueryPrintTemplateBo() { } - public QuerySysRoleBo(SysRole dto) { + public QueryPrintTemplateBo(PrintTemplate dto) { super(dto); } - - @Override - protected void afterInit(SysRole dto) { - } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/GetProductBrandBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/GetProductBrandBo.java index 1cf8f35e77395f8f36ec2490e88c063ce0437bbc..e8dea0dcf9613ba13ff6e93f8c45cfe33433b06b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/GetProductBrandBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/GetProductBrandBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.brand; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductBrand; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductBrandSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductBrandSelectorBo.java index f41c3290b7ae736a59eff4dd1682ffe0eee14a63..39582a1157ea4e864e5c84260812de223da2911e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductBrandSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductBrandSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.brand; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductBrand; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductCategorySelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductCategorySelectorBo.java index a540cc0868d32beb2e50a4861eaa12c26b7218fe..79a993e841de496e3e799de5fa8cd851a06555f7 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductCategorySelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/ProductCategorySelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.brand; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductCategory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/QueryProductBrandBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/QueryProductBrandBo.java index aed56bc1ed3c3a60128b346a5f9f1bfceb51c63f..13132f7d178dd1c3208a8937310c892ae42a65de 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/QueryProductBrandBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/brand/QueryProductBrandBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.brand; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductBrand; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 1a03eb0341d9a535a88d346046cd465930a9ffb8..c1b8e780766d7b3344ca58c7eed399afee56d077 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 @@ -2,8 +2,8 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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/category/ProductCategoryTreeBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/ProductCategoryTreeBo.java index eeef7e79c1440124977d1f8c776f866895adc3b4..7723ad0dbc106a2833db6961bd38f8a400a0c70d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/ProductCategoryTreeBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/ProductCategoryTreeBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.category; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductCategory; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 10dc422313ef1669062b21043b7aded5962a3474..1650d2dfcb20436840d39af9a3476e0f2ba9a874 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 @@ -2,9 +2,9 @@ package com.lframework.xingyun.basedata.bo.product.info; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.dto.product.ProductPropertyRelationDto; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductBundleBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductBundleBo.java index f03344172b5e9424d566adea4940cb66ef0a145e..ecaa9c6cc9e50a2a10c1b92809fdcae0bfc4418e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductBundleBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductBundleBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.info; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductBundle; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; 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 35e784a112842216a4ec2ef651ddf9f40a94b74e..19911a2c14c07380d099207fe1f65dfdbe49f5e8 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 @@ -1,8 +1,8 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; 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 e60d9a8dc2dd13578fff1089d500716e8e3cdf1b..0def7c01763bb5cc2a4fecdff8fd0f727e618c21 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 @@ -2,9 +2,9 @@ package com.lframework.xingyun.basedata.bo.product.info; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; 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 aa32baf6416f41653459b8ed34ebb156585bb92a..a6a18306aed7b63e2e8325d4c359b5e7cdeb367e 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.ProductCategoryProperty; import com.lframework.xingyun.basedata.entity.ProductProperty; import com.lframework.xingyun.basedata.enums.PropertyType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/ProductPropertyModelorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/ProductPropertyModelorBo.java index 6ee65514211008243c771ac2339ba2ab8ae03ade..2800f38d53a9d89f8d72143e70ca5eaff269592b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/ProductPropertyModelorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/ProductPropertyModelorBo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.bo.product.property; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.dto.product.property.ProductPropertyModelorDto; import io.swagger.annotations.ApiModelProperty; import java.util.List; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/QueryProductPropertyBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/QueryProductPropertyBo.java index f29d75210877f60dd1ee048c97a7a977d3c487b5..728a6a51bd8062c11994475e1c764833f6f80406 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/QueryProductPropertyBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/QueryProductPropertyBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.property; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/GetProductPropertyItemBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/GetProductPropertyItemBo.java index c68676f75bf4a08e672980c31e49a6fab20c6369..13213c2f69183585f8d38b773a7330b944157c37 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/GetProductPropertyItemBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/GetProductPropertyItemBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.property.item; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductPropertyItem; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/QueryProductPropertyItemBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/QueryProductPropertyItemBo.java index 1326480183acbce4c04648fa44f8bf2b172d388a..76e8f614d50960524c28ba1fff837f05e20f595e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/QueryProductPropertyItemBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/item/QueryProductPropertyItemBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.product.property.item; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.ProductPropertyItem; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 bf0f1d1a4aa77ef1ba0835531acfef18f64bff44..a70d6f02f26651f0ff76fc095348e5bdefd26222 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 @@ -1,11 +1,11 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Shop; -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.xingyun.template.inner.service.system.SysDeptService; +import com.lframework.starter.web.inner.entity.SysDept; +import com.lframework.starter.web.inner.service.system.SysDeptService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; 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 9707778bd7173368236aa7b9a093c3a9a6770fa1..2903b2d15e96686b503e0b2be37fed94290964b6 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 @@ -3,11 +3,11 @@ package com.lframework.xingyun.basedata.bo.shop; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Shop; -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.xingyun.template.inner.service.system.SysDeptService; +import com.lframework.starter.web.inner.entity.SysDept; +import com.lframework.starter.web.inner.service.system.SysDeptService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/ShopSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/ShopSelectorBo.java index 322e70e275fa7c432bd1e4416fe255308a8e12ba..c647dc100346222a49565265234a6f4234047a9d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/ShopSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/ShopSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.shop; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Shop; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 4dba9a227bb123c55aa0bd4d650eb3d1ee06092c..6b9c4d8d36c2f1752428d2c1a29adad0057c9317 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 @@ -2,11 +2,11 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.stream.Collectors; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/QueryStoreCenterBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/QueryStoreCenterBo.java index 972ee16f008169353b221c6514d24de3c78ff3a6..45d4cd269c205a72bad76dedf2c35dfe931097e7 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/QueryStoreCenterBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/QueryStoreCenterBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.storecenter; 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.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.StoreCenter; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/StoreCenterSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/StoreCenterSelectorBo.java index 362e3e1e94520df6058b6d4a5f60f4d805d91789..e487e4c972c25715f25ed9c006d5671b287c9e4a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/StoreCenterSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/StoreCenterSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.storecenter; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.StoreCenter; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 57bd730f95890b69556ca5ba6fb38d14f6fd5f58..454828ba28224fd8e24cea60b383707c1225b3d7 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 @@ -2,11 +2,11 @@ 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.stream.Collectors; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/QuerySupplierBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/QuerySupplierBo.java index c88dbdf670543c55f14951eed31317757894f77e..f048a290ccd38e70e4a23471cba1ac0a9b01b71f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/QuerySupplierBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/QuerySupplierBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.supplier; 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.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Supplier; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/SupplierSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/SupplierSelectorBo.java index 745e218a8e1273bc7b70cf355d7fac6ec3904e55..e07cf6173ba9865cf1e7c99d3ca1969efb4ae91f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/SupplierSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/SupplierSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.bo.supplier; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.basedata.entity.Supplier; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/AddressController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/AddressController.java index 845f0b13f9cfdcb4795ab6acc16235515eab9dfa..e83da765ca4ddf90587cad411560b56815bf5f2e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/AddressController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/AddressController.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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.address.GetAddressBo; import com.lframework.xingyun.basedata.bo.address.QueryAddressBo; import com.lframework.xingyun.basedata.entity.Address; @@ -19,7 +19,7 @@ import com.lframework.xingyun.basedata.service.address.AddressService; import com.lframework.xingyun.basedata.vo.address.CreateAddressVo; import com.lframework.xingyun.basedata.vo.address.QueryAddressVo; import com.lframework.xingyun.basedata.vo.address.UpdateAddressVo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; 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 80091b8682338856fd6ce3cc008d312cb25a68a8..52277d0de29ab4ee9810b51e44c3d2b8192f6df3 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 @@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.components.validation.IsEnum; -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.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.basedata.bo.address.AddressSelectorBo; import com.lframework.xingyun.basedata.bo.customer.CustomerSelectorBo; import com.lframework.xingyun.basedata.bo.logistics.company.LogisticsCompanySelectorBo; 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 41d4274c8428d9a2268b1b4a8089d917718e116b..5e4dc5f97eaa001b9f175035a2d0c1e6234f2f5e 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.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; 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 f45250670df70bcb1dd6ea48be8359967e8d0d5b..0768792e6abdbf5ada12ba65811193cfbd5d43f0 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.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; 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 e9f736a2ddba3731d7f7530a3385edbbba792ba4..92c7e7b760c9c4a50497bd324745612196fd8600 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.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; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PayTypeController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PayTypeController.java index 8c9e3e8e68df0894160b8a9d0fbce79034b04abe..982f4ac72c55f40c2f229266aad6e1a95406509d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PayTypeController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PayTypeController.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.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.basedata.bo.paytype.GetPayTypeBo; import com.lframework.xingyun.basedata.bo.paytype.QueryPayTypeBo; import com.lframework.xingyun.basedata.entity.PayType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PrintTemplateController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PrintTemplateController.java new file mode 100644 index 0000000000000000000000000000000000000000..4b5d0bea2eb3f1cf0bb67be65768686c02dc010a --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/PrintTemplateController.java @@ -0,0 +1,187 @@ +package com.lframework.xingyun.basedata.controller; + +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.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.xingyun.basedata.bo.print.GetPrintTemplateBo; +import com.lframework.xingyun.basedata.bo.print.GetPrintTemplateCompSettingBo; +import com.lframework.xingyun.basedata.bo.print.GetPrintTemplateSettingBo; +import com.lframework.xingyun.basedata.bo.print.QueryPrintTemplateBo; +import com.lframework.xingyun.basedata.entity.PrintTemplate; +import com.lframework.xingyun.basedata.entity.PrintTemplateComp; +import com.lframework.xingyun.basedata.service.print.PrintTemplateCompService; +import com.lframework.xingyun.basedata.service.print.PrintTemplateService; +import com.lframework.xingyun.basedata.vo.print.CreatePrintTemplateVo; +import com.lframework.xingyun.basedata.vo.print.QueryPrintTemplateVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateDemoDataVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateSettingVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import java.util.ArrayList; +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.GetMapping; +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; + +/** + * 打印模板 + * + * @author zmj + */ +@Api(tags = "打印模板") +@Validated +@RestController +@RequestMapping("/basedata/print/template") +public class PrintTemplateController extends DefaultBaseController { + + @Autowired + private PrintTemplateService printTemplateService; + + @Autowired + private PrintTemplateCompService printTemplateCompService; + + /** + * 查询列表 + */ + @ApiOperation("查询列表") + @HasPermission({"base-data:print-template:query"}) + @GetMapping("/query") + public InvokeResult> query(@Valid QueryPrintTemplateVo vo) { + + PageResult pageResult = printTemplateService.query(getPageIndex(vo), + getPageSize(vo), vo); + + List datas = pageResult.getDatas(); + List results = null; + + if (!CollectionUtil.isEmpty(datas)) { + results = datas.stream().map(QueryPrintTemplateBo::new).collect(Collectors.toList()); + } + + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } + + /** + * 根据ID查询 + */ + @ApiOperation("根据ID查询") + @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) + @HasPermission({"base-data:print-template:query"}) + @GetMapping + public InvokeResult get(@NotNull(message = "ID不能为空！") Integer id) { + + PrintTemplate data = printTemplateService.findById(id); + if (data == null) { + throw new DefaultClientException("打印模板不存在！"); + } + + GetPrintTemplateBo result = new GetPrintTemplateBo(data); + + return InvokeResultBuilder.success(result); + } + + /** + * 新增 + */ + @ApiOperation("新增") + @HasPermission({"base-data:print-template:add"}) + @PostMapping + public InvokeResult create(@Valid CreatePrintTemplateVo vo) { + + printTemplateService.create(vo); + + return InvokeResultBuilder.success(); + } + + /** + * 修改 + */ + @ApiOperation("修改") + @HasPermission({"base-data:print-template:modify"}) + @PutMapping + public InvokeResult update(@Valid UpdatePrintTemplateVo vo) { + + printTemplateService.update(vo); + + return InvokeResultBuilder.success(); + } + + /** + * 查询设置 + */ + @ApiOperation("查询设置") + @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) + @GetMapping("/setting") + public InvokeResult getSetting( + @NotNull(message = "ID不能为空！") Integer id) { + + PrintTemplate data = printTemplateService.findById(id); + if (data == null) { + throw new DefaultClientException("打印模板不存在！"); + } + + GetPrintTemplateSettingBo result = new GetPrintTemplateSettingBo(data); + + return InvokeResultBuilder.success(result); + } + + /** + * 保存设置 + */ + @ApiOperation("保存设置") + @HasPermission({"base-data:print-template:modify"}) + @PutMapping("/setting") + public InvokeResult updateSetting(@Valid UpdatePrintTemplateSettingVo vo) { + + printTemplateService.updateSetting(vo); + + return InvokeResultBuilder.success(); + } + + @ApiOperation("设置示例数据") + @HasPermission({"base-data:print-template:modify"}) + @PutMapping("/setting/demo") + public InvokeResult updateDemoData(@Valid UpdatePrintTemplateDemoDataVo vo) { + + printTemplateService.updateDemoData(vo); + + return InvokeResultBuilder.success(); + } + + /** + * 查询组件设置 + */ + @ApiOperation("查询组件设置") + @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) + @HasPermission({"base-data:print-template:modify"}) + @GetMapping("/setting/comp") + public InvokeResult> getCompSetting( + @NotNull(message = "ID不能为空！") Integer id) { + List datas = new ArrayList<>(); + datas.addAll(printTemplateCompService.list(Wrappers.lambdaQuery(PrintTemplateComp.class) + .eq(PrintTemplateComp::getTemplateId, 0))); + datas.addAll(printTemplateCompService.list(Wrappers.lambdaQuery(PrintTemplateComp.class) + .eq(PrintTemplateComp::getTemplateId, id))); + + List results = datas.stream() + .map(GetPrintTemplateCompSettingBo::new).collect( + Collectors.toList()); + + return InvokeResultBuilder.success(results); + } +} 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 6f391b69af4f9fee3047da8c11ab0035dc64ab78..eaa4428feb17cc89519bbfa6aa3bcd6834d503ec 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.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; 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 e250af8918fa857ee4c4a3339dd98435486790ec..512e3991f14e9d4cb0933099a1f86c935a582846 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,13 +2,11 @@ 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.core.service.RecursionMappingService; -import com.lframework.starter.web.annotations.security.HasPermission; -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; -import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.utils.ExcelUtil; import com.lframework.xingyun.basedata.bo.product.category.GetProductCategoryBo; import com.lframework.xingyun.basedata.bo.product.category.ProductCategoryTreeBo; import com.lframework.xingyun.basedata.entity.ProductCategory; @@ -18,6 +16,7 @@ import com.lframework.xingyun.basedata.excel.product.category.ProductCategoryImp 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.UpdateProductCategoryVo; +import com.lframework.starter.web.inner.service.RecursionMappingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -156,7 +155,7 @@ public class ProductCategoryController extends DefaultBaseController { if (data.getAvailable()) { //如果是停用 子节点全部停用 List childrenIds = recursionMappingService.getNodeChildIds(data.getId(), - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); if (!CollectionUtil.isEmpty(childrenIds)) { for (String childrenId : childrenIds) { productCategoryService.cleanCacheByKey(childrenId); @@ -167,7 +166,7 @@ public class ProductCategoryController extends DefaultBaseController { if (!data.getAvailable()) { //如果是启用 父节点全部启用 List parentIds = recursionMappingService.getNodeParentIds(data.getId(), - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); if (!CollectionUtil.isEmpty(parentIds)) { for (String parentId : parentIds) { productCategoryService.cleanCacheByKey(parentId); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductController.java index d33c77a93d2e6177f3795067485f0c964ded88e1..b689d979e55e69f3d92c5e430bbe36ddb5544ea0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductController.java @@ -1,13 +1,13 @@ package com.lframework.xingyun.basedata.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.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.ExcelUtil; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.utils.ExcelUtil; import com.lframework.xingyun.basedata.bo.product.info.GetProductBo; import com.lframework.xingyun.basedata.bo.product.info.QueryProductBo; import com.lframework.xingyun.basedata.entity.Product; 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 8778a0849b795c5461c48abdaefe3c08c2279087..7bce1a2c9f67fa14276c9fdfe75083baf14c5208 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.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.threads.DefaultRunnable; -import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.threads.DefaultRunnable; +import com.lframework.starter.web.core.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; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyItemController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyItemController.java index 97ba13246baed909a6899b3f4770bb33d4eac1c1..7f1bcc65a1eaa717af836f8d752ce2a2d249976f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyItemController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyItemController.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.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.basedata.bo.product.property.item.GetProductPropertyItemBo; import com.lframework.xingyun.basedata.bo.product.property.item.QueryProductPropertyItemBo; import com.lframework.xingyun.basedata.entity.ProductPropertyItem; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ShopController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ShopController.java index bb44612183cbc2dd99a42fd490eb897317a1ba07..9fa03bbb46fdf14afcf4bc8a85aa284c47c54336 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ShopController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ShopController.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.utils.ExcelUtil; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.utils.ExcelUtil; import com.lframework.xingyun.basedata.bo.shop.GetShopBo; import com.lframework.xingyun.basedata.bo.shop.QueryShopBo; import com.lframework.xingyun.basedata.entity.Shop; 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 502e34534e745ed9a3f77bc6e4e1d145fcd17209..2e25c06c87558064ac3cc2d00c163ddb71522cdf 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.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; 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 463b02114506a01dc68b00f47d310c98c749f8d4..afa7618359d3e8c4f2d482074916a3228e844a0b 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.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; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/ProductPropertyRelationDto.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/ProductPropertyRelationDto.java index ad509109adfd53cd1bbfaf3f8bb1a7fae099b099..ebba848e83658cda6584c4b7b612196155ce909b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/ProductPropertyRelationDto.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/ProductPropertyRelationDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.dto.product; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.ColumnType; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/property/ProductPropertyModelorDto.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/property/ProductPropertyModelorDto.java index 498227dae4ea0150c5769e6cdd9769731539e40a..617ef20e2d427e4a2ac29b1833a4b2654c7ba619 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/property/ProductPropertyModelorDto.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/dto/product/property/ProductPropertyModelorDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.dto.product.property; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.ColumnDataType; import com.lframework.xingyun.basedata.enums.ColumnType; import com.lframework.xingyun.basedata.enums.PropertyType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Address.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Address.java index 2083bb05ebda27dfed09635308a63939b207a0f8..f2f0cf14d4046e26038cfdebe48126b88e99232b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Address.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Address.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; import java.time.LocalDateTime; 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 a7f692290579a11e99ebc4da6ddeba1c84d3291a..b6142468d004c35452ad5cbd7a625d62f7bf5cfc 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 @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.SettleType; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/LogisticsCompany.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/LogisticsCompany.java index f5063f553150e11dd76c7877df02277ed965d090..a7f417039f4a7fbfcbbb8b79e320b60af4a30da0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/LogisticsCompany.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/LogisticsCompany.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; 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 0c1c7dd8bb6d832a1765fc6353c92448f022e5d4..2c6ec9e049ccd3c022689c4e70de5b41f9570d27 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 @@ -3,9 +3,9 @@ package com.lframework.xingyun.basedata.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.xingyun.core.enums.Gender; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; +import com.lframework.starter.web.inner.enums.system.Gender; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PayType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PayType.java index 0ec21722a66668f4d7d6ee51e23857e943a3f73f..7f376483b7357ca156b726c25ab00a88ba92cbaf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PayType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PayType.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PrintTemplate.java similarity index 69% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PrintTemplate.java index 1ad1cad5277773e9a43d3bd2d4ea6b9c9bf5c0c9..b5cc63d8cbd2ddae305492c5fa56ae7af64b3239 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PrintTemplate.java @@ -1,27 +1,28 @@ -package com.lframework.xingyun.template.inner.entity; +package com.lframework.xingyun.basedata.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; 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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.time.LocalDateTime; import lombok.Data; /** *

- * 系统模块 + * *

* * @author zmj + * @since 2025-01-28 */ @Data -@TableName("sys_module") -public class SysModule extends BaseEntity implements BaseDto { +@TableName("tbl_print_template") +public class PrintTemplate extends BaseEntity implements BaseDto { - public static final String CACHE_NAME = "SysModule"; + public static final String CACHE_NAME = "PrintTemplate"; private static final long serialVersionUID = 1L; /** @@ -36,9 +37,14 @@ public class SysModule extends BaseEntity implements BaseDto { private String name; /** - * 备注 + * JSON配置 + */ + private String templateJson; + + /** + * 示例数据 */ - private String description; + private String demoData; /** * 创建人ID 新增时赋值 @@ -53,7 +59,7 @@ public class SysModule extends BaseEntity implements BaseDto { private String createBy; /** - * 创建时间 + * 创建时间 新增时赋值 */ @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; @@ -71,7 +77,7 @@ public class SysModule extends BaseEntity implements BaseDto { private String updateById; /** - * 修改时间 + * 修改时间 新增和修改时赋值 */ @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PrintTemplateComp.java similarity index 36% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PrintTemplateComp.java index c78adf944376be43608d05b1bbc0f2484c3c466f..aaf958f1935f11b1c63e56e081a92f1974141897 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/PrintTemplateComp.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.template.inner.entity; +package com.lframework.xingyun.basedata.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.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** @@ -11,12 +11,13 @@ import lombok.Data; *

* * @author zmj - * @since 2021-07-04 + * @since 2025-01-28 */ @Data -@TableName("sys_role_menu") -public class SysRoleMenu extends BaseEntity implements BaseDto { +@TableName("tbl_print_template_comp") +public class PrintTemplateComp extends BaseEntity implements BaseDto { + public static final String CACHE_NAME = "PrintTemplateComp"; private static final long serialVersionUID = 1L; /** @@ -25,14 +26,12 @@ public class SysRoleMenu extends BaseEntity implements BaseDto { private String id; /** - * 角色ID + * 模板ID */ - private String roleId; + private Integer templateId; /** - * 菜单ID + * 组件配置 */ - private String menuId; - - + private String compJson; } 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 fe5dae9e7ccbd6630053fa877816a8d349f959f9..34b6d168e56aea229c86a89fec6b1bc0d6a90ef9 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 @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.ProductType; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBrand.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBrand.java index 0529ac26169340cad85969bd3d614991bb117d99..7985d8485b249bdf006b84b90e334037259aea7b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBrand.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBrand.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBundle.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBundle.java index f33e513063d10b1fda8c7a297044f0aeed428914..2270e26bee15756ead44457ebfa07678a79fe028 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBundle.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductBundle.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategory.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategory.java index 91ab6f1d06cc07b5ef03778bc88aa1a5f688d0d1..9265a4df8dd0a902291063a2411149bf8e29b981 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategory.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategory.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; 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 a9c202207b6db87b68ac5029b76ac107f0265f8e..f14b80e05e6f42baaa2144cc5bc13fc7c397d9dd 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import lombok.Data; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductProperty.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductProperty.java index c39483d4507d30e3e7c3ee66b8687940ba328493..1b73ebbf71b57bafdd5eaa890cdac7b1e4d021ea 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductProperty.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductProperty.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.ColumnDataType; import com.lframework.xingyun.basedata.enums.ColumnType; import com.lframework.xingyun.basedata.enums.PropertyType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyItem.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyItem.java index fe8591d50cdad0e864270120f475425ac66ef2e1..a27ad199088b04ad2211334102c82aade80492d1 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyItem.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyItem.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyRelation.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyRelation.java index 5571e20868f3a04cf0369ce2741f42e5241dab23..6ade108dde473c0146fcf1d8844c317d0e01a9c1 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyRelation.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPropertyRelation.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import lombok.Data; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPurchase.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPurchase.java index 112289cfb140a9a68337be294082ac6ceda1b08d..6c4ed2651f50ed8598234039943852418ddb8f3e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPurchase.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductPurchase.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductRetail.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductRetail.java index fc744fb037362c941d6fea77bddac57ebd53d157..9a7c65120b9cf0841b903b3d710d8a6b47b242fc 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductRetail.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductRetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductSale.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductSale.java index f51ed01e4754447ed1e254923dc75ec49e027e76..1d2625735dcc119c555723fa65a9f77a99450c71 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductSale.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductSale.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Shop.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Shop.java index 85f2f1d9ed2d1efa8aaae65e2f28dccc700d29cf..47660c2e72eecb71b1ae9ea48e8b1a4af4952d27 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Shop.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Shop.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/StoreCenter.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/StoreCenter.java index 58185e73ebf56c2e9c3f7160d7f0809e8f5d0360..e2c44c44eec8dd64d91e982937b9a18b4464d71f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/StoreCenter.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/StoreCenter.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; 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 968b654dc46da85e6678ab55c8b881e0d88a3253..76c21652d604bca6d7231dfafb1cba38dd2c76bd 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 @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.basedata.enums.ManageType; import com.lframework.xingyun.basedata.enums.SettleType; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressEntityType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressEntityType.java index effdf8bde63eda2d7df4ac2eea3618e95eb98009..cf41c9501f003f879658d9fce503881e842fab0a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressEntityType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressEntityType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum AddressEntityType implements BaseEnum { SC(1, "仓库"), CUSTOMER(2, "客户"), SUPPLIER(3, "供应商"), MEMBER(4, "会员"), SHOP(5, "门店"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressType.java index 6dbf702eea0b64c1d21828af543272c91264f4ff..5c86cd28106e9f39440bbf8a762690c45407b92f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/AddressType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum AddressType implements BaseEnum { DELIVERY(1, "发货地址"), RECEIVE(2, "收货地址"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/BaseDataOpLogType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/BaseDataOpLogType.java index c1663ef6dc7ef2c93f5929253f3963a0d8d23a51..f25407edea1f2eafc169b39bb27c8e47deaede04 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/BaseDataOpLogType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/BaseDataOpLogType.java @@ -1,7 +1,12 @@ package com.lframework.xingyun.basedata.enums; -public interface BaseDataOpLogType { +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; - // 基础信息 - int BASE_DATA = 1000; +@Component +public class BaseDataOpLogType implements OpLogType { + @Override + public Integer getCode() { + return 1000; + } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnDataType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnDataType.java index add247a1a3f4a647dce0e725ef488ccfc5e415f6..45af9d0d9d54ec999b2fdb007b38f7c275736261 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnDataType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnDataType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ColumnDataType implements BaseEnum { INT(1, "整数型"), FLOAT(2, "浮点型"), STRING(3, "字符型"), DATE(4, "日期型"), TIME(5, "时间型"), DATE_TIME(6, diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnType.java index ac9231334a5f1d0b0736bef6a54237d098ce68a3..29ae50241769bad4a838a667cc5def8676a4d5a8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ColumnType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ColumnType implements BaseEnum { MULTIPLE(1, "多选"), SINGLE(2, "单选"), CUSTOM(3, "手动录入"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/InvoiceType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/InvoiceType.java index e639ebb24ce4c387a979b01be694cf8c7d6cec51..4b1a73e31140e28ce9183cffb2d934c5ce2d24ce 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/InvoiceType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/InvoiceType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum InvoiceType implements BaseEnum { NORMAL(1, "增值税普通发票"), SPECIAL(2, "增值税专用发票"), NORMAL_OR_SPECIAL(3, "增值税专用发票或增值税普通发票"), diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ManageType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ManageType.java index e4e23ea24b478829044b938dc67047f5d420de97..b9989272f3d4b27982290ed34ac5c38fec0d5938 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ManageType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ManageType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ManageType implements BaseEnum { DISTRIBUTION(1, "经销"); 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 85fd2ab85af3edcef1f2640a1b972a58995cede9..8b84f89118d414a6f3d7dbc48b1c3881503af0d0 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.core.enums.NodeType; +import com.lframework.starter.web.inner.enums.system.NodeType; import java.io.Serializable; import org.springframework.stereotype.Component; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductType.java index 5dfea3242ad4cc05d6ae18cbcae2f2353e27c765..6961a874c0bbab65bb2c1f04e15a4dbd18cc8909 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ProductType implements BaseEnum { NORMAL(1, "普通商品"), BUNDLE(2, "组合商品"); 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 6d57018adb789942f4881f8deb63f6f6922c5ea5..41b6fd3d0bb4732bc60f2774a0132c4fddefad7c 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum PropertyType implements BaseEnum { COMMON(1, "通用属性"), APPOINT(2, "指定分类属性"), NONE(3, "无"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/SettleType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/SettleType.java index d7fc2e964d02e8b8e2af949e782050bafb170fec..a7d4294af8675f26e719f9f13a09a24af8436aed 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/SettleType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/SettleType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleType implements BaseEnum { ARBITRARILY(1, "任意指定"), CASH_ON_DELIVERY(2, "货到付款"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/TaxRate.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/TaxRate.java index 5b35c5e1d20743a3d7588622ee843e0eb374a277..2d830333ae441ee2fe25b6b73150626ba8cbb3ad 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/TaxRate.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/TaxRate.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum TaxRate implements BaseEnum { RATE17(17, "17%"), RATE11(11, "11%"), RATE6(6, "6%"), RATE3(3, "3%"), RATE0(0, "0%"), FREE(-1, 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 2e9891ef2b92edddd556c7474b9d76761c44d0d4..d9881753774ddd3868e2050341901b95ba3c14e8 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 @@ -1,9 +1,9 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; @@ -16,8 +16,8 @@ import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.shop.ShopService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import lombok.Data; @Data diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportTaskWorker.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportTaskWorker.java index b0bee4b8794b10778c62b84c7c7dfd54fdc372a3..2e1e3b7ae35006bae2bf4e0dd2130d87b6012265 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportTaskWorker.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportTaskWorker.java @@ -1,12 +1,12 @@ package com.lframework.xingyun.basedata.excel.address; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.service.address.AddressService; import com.lframework.xingyun.basedata.vo.address.QueryAddressVo; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; public class AddressExportTaskWorker implements ExportTaskWorker { 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 032c8f7a346c96bac131fe274df28d59522015d3..ec0775d9d0b9b0585719d834feabb3679bba58da 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 @@ -6,9 +6,9 @@ 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.StringUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.Shop; @@ -23,8 +23,8 @@ import com.lframework.xingyun.basedata.service.shop.ShopService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.basedata.vo.address.CreateAddressVo; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportModel.java index 103f1c5c47b82477473a7eeea29593fc645e4dd6..67bf19909a0bafdc1a2be62f356a06dea39bd568 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.address; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; import lombok.Data; 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 e93bebae4b8864187cf9e6c5360c1d09d1306dd6..643fd5fca39114b32cc0b3046d1b81ff3f056c58 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,15 +9,15 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.enums.SettleType; import com.lframework.xingyun.basedata.service.customer.CustomerService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportModel.java index d74fa66400a2eafea64f2660f443c3912c828a94..af9ab87d7f1482f1fed995d5ca3af9520e70ca19 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.customer; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.enums.SettleType; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportListener.java index 705ba305ad8ecf32af9f62c36260433b0e0ad78b..84412ce9cdfecabd7561dad55c93b12a4d0a877c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportListener.java @@ -10,17 +10,17 @@ import com.lframework.starter.common.utils.CollectionUtil; 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.components.excel.ExcelImportListener; -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.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.shop.ShopService; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.core.enums.Gender; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.enums.system.Gender; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.util.ArrayList; import java.util.Date; import java.util.List; 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 d5a502a1e34cc9aee95b983e153516cbefa4a13b..143004c7ac652194e80e049410db474da14a6b0b 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,9 +2,9 @@ package com.lframework.xingyun.basedata.excel.member; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.xingyun.core.enums.Gender; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.inner.enums.system.Gender; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.util.Date; import lombok.Data; 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 1129014ace4c853c0ca524eecdab5a2a4d14187d..a5bf688c5dd34e596a0a5e6345d1d8d10f60b676 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,9 +9,9 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportModel.java index 0d50071684f7c2820d86276c55d84c728c30a87c..0d5ee5ebeb654419cb0196bccd47e23643e2b7d4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.product; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportListener.java index 4fc662916874cdbb40b3684e89260d0837c46f2e..c862f377bb16b9a4a7b7387acadcea2b46f78685 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportListener.java @@ -8,9 +8,9 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.service.product.ProductBrandService; import java.util.ArrayList; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportModel.java index 2d9693535ba3095b1f0f259c216c36cae4842492..3f0496f79da1e857768cb7e61b66838cd4b87cf5 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/brand/ProductBrandImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.product.brand; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import lombok.Data; @Data diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportListener.java index 53698c9fbe22fec5d0541e63dc796bf9f10d46cc..3ec9ae88eaad702059379839664287bf7c9c852c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportListener.java @@ -8,9 +8,9 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.service.product.ProductCategoryService; import java.util.ArrayList; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportModel.java index ac174118e830e585d50bdd7e77fd1e67ed0c4b5d..6fd09ee0100526d271f04c87cac204a3d060a3c1 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/category/ProductCategoryImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.product.category; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import lombok.Data; @Data diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportListener.java index 144a808a23d27e16b0e078323e63c588b3307c7e..c2269273b50b25be454348ec279a53b754740078 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportListener.java @@ -8,13 +8,13 @@ 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.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.service.shop.ShopService; -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.xingyun.template.inner.service.system.SysDeptService; +import com.lframework.starter.web.inner.entity.SysDept; +import com.lframework.starter.web.inner.service.system.SysDeptService; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportModel.java index efdc86529a43d3a9af8a20d4ca7bca6566ec166b..9171b42d571bab5bdd385d62002108fe971f955b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/shop/ShopImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.shop; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import lombok.Data; @Data 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 7e2133beabed1e6cc059416b05213426d91666c9..195749af6f8b79b00d7fe8551efd54f65c8d6952 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,13 +8,13 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; 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 com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportModel.java index 57559a12feecfd45892e13ee16afefe9a8c40650..346beaf9c0603ad8a65f50ea9edf42828e936981 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.storecenter; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import lombok.Data; @Data 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 a8193d5fb43858908ab2a720becfb55f30c89068..bde34ad4f6ad393604c7e55b201dab8d3aa69368 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,16 +9,16 @@ 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.enums.ManageType; import com.lframework.xingyun.basedata.enums.SettleType; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportModel.java index 76bb7c3a4b426bd044fb5b47f4713e8608c80a1d..863c86300b34f17a7719ffc065a6a3cd5c1d40ba 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.basedata.excel.supplier; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.enums.ManageType; import com.lframework.xingyun.basedata.enums.SettleType; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/address/AddressServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/address/AddressServiceImpl.java index 9215ba50a71655f3b766176734e6239eeadaa96d..d0f50736013fd8672852815b067030f629a01948 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/address/AddressServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/address/AddressServiceImpl.java @@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.exceptions.impl.DefaultClientException; 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.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.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; @@ -21,9 +21,9 @@ import com.lframework.xingyun.basedata.vo.address.AddressSelectorVo; import com.lframework.xingyun.basedata.vo.address.CreateAddressVo; import com.lframework.xingyun.basedata.vo.address.QueryAddressVo; import com.lframework.xingyun.basedata.vo.address.UpdateAddressVo; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; -import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; +import com.lframework.starter.web.core.annotations.oplog.OpLog; import java.io.Serializable; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -76,7 +76,7 @@ public class AddressServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用客户，ID：{}", params = "#id") + @OpLog(type = BaseDataOpLogType.class, name = "停用客户，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override public void unable(String id) { @@ -92,7 +92,7 @@ public class CustomerServiceImpl extends BaseMpServiceImpl i return getBaseMapper().selectById(id); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用会员，ID：{}", params = "#id") + @OpLog(type = BaseDataOpLogType.class, name = "停用会员，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override public void unable(String id) { @@ -73,7 +73,7 @@ public class MemberServiceImpl extends BaseMpServiceImpl i getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用会员，ID：{}", params = "#id") + @OpLog(type = BaseDataOpLogType.class, name = "启用会员，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override public void enable(String id) { @@ -84,7 +84,7 @@ public class MemberServiceImpl extends BaseMpServiceImpl i getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增会员，ID：{}, 编号：{}", params = {"#id", + @OpLog(type = BaseDataOpLogType.class, name = "新增会员，ID：{}, 编号：{}", params = {"#id", "#code"}) @Transactional(rollbackFor = Exception.class) @Override @@ -140,7 +140,7 @@ public class MemberServiceImpl extends BaseMpServiceImpl i return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改会员，ID：{}, 编号：{}", params = {"#id", + @OpLog(type = BaseDataOpLogType.class, name = "修改会员，ID：{}, 编号：{}", params = {"#id", "#code"}) @Transactional(rollbackFor = Exception.class) @Override 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 df27c3c1318d6a2ee8b0d1cf741072127628e9af..91a1d654447c33ac405a126887f69198b4149465 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,14 +9,14 @@ 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.core.annotations.OpLog; +import com.lframework.starter.web.core.annotations.oplog.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.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.OpLogUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.mappers.PayTypeMapper; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; @@ -72,7 +72,7 @@ public class PayTypeServiceImpl extends BaseMpServiceImpl implements + PrintTemplateCompService { + + @Override + public List getCompJsonByTemplateId(Integer templateId) { + + Wrapper queryWrapper = Wrappers.lambdaQuery(PrintTemplateComp.class) + .eq(PrintTemplateComp::getTemplateId, templateId); + List datas = getBaseMpMapper().selectList(queryWrapper); + + return datas.stream().map(PrintTemplateComp::getCompJson).collect(Collectors.toList()); + } +} diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/print/PrintTemplateServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/print/PrintTemplateServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..8b32cad639f9b07f0c3b8cd91f3d82ccf1c33643 --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/print/PrintTemplateServiceImpl.java @@ -0,0 +1,132 @@ +package com.lframework.xingyun.basedata.impl.print; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageInfo; +import com.lframework.starter.common.exceptions.impl.DefaultClientException; +import com.lframework.starter.common.utils.Assert; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.xingyun.basedata.entity.PrintTemplate; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; +import com.lframework.xingyun.basedata.mappers.PrintTemplateMapper; +import com.lframework.xingyun.basedata.service.print.PrintTemplateService; +import com.lframework.xingyun.basedata.vo.print.CreatePrintTemplateVo; +import com.lframework.xingyun.basedata.vo.print.QueryPrintTemplateVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateDemoDataVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateSettingVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateVo; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import java.io.Serializable; +import java.util.List; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class PrintTemplateServiceImpl extends + BaseMpServiceImpl implements + PrintTemplateService { + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QueryPrintTemplateVo 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(QueryPrintTemplateVo vo) { + return getBaseMapper().query(vo); + } + + @Override + public PrintTemplate findById(Integer id) { + return getById(id); + } + + @OpLog(type = BaseDataOpLogType.class, name = "新增打印模板，名称：{}", params = {"#vo.name"}) + @Transactional(rollbackFor = Exception.class) + @Override + public Integer create(CreatePrintTemplateVo vo) { + Wrapper checkNameWrapper = Wrappers.lambdaQuery(PrintTemplate.class) + .eq(PrintTemplate::getName, vo.getName()); + if (getBaseMapper().selectCount(checkNameWrapper) > 0) { + throw new DefaultClientException("名称重复，请重新输入！"); + } + + PrintTemplate data = new PrintTemplate(); + data.setName(vo.getName()); + + getBaseMapper().insert(data); + + return data.getId(); + } + + @OpLog(type = BaseDataOpLogType.class, name = "修改打印模板，ID：{}，名称：{}", params = { + "#vo.id", "#vo.name"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdatePrintTemplateVo vo) { + Wrapper checkNameWrapper = Wrappers.lambdaQuery(PrintTemplate.class) + .eq(PrintTemplate::getName, vo.getName()).ne(PrintTemplate::getId, vo.getId()); + if (getBaseMapper().selectCount(checkNameWrapper) > 0) { + throw new DefaultClientException("名称重复，请重新输入！"); + } + + PrintTemplate data = getById(vo.getId()); + if (data == null) { + throw new DefaultClientException("打印模板不存在！"); + } + + Wrapper updateWrapper = Wrappers.lambdaUpdate(PrintTemplate.class) + .eq(PrintTemplate::getId, vo.getId()).set(PrintTemplate::getName, vo.getName()); + + getBaseMapper().update(updateWrapper); + } + + @OpLog(type = BaseDataOpLogType.class, name = "修改打印模板设置，ID：{}", params = { + "#vo.id"}, autoSaveParams = true) + @Transactional(rollbackFor = Exception.class) + @Override + public void updateSetting(UpdatePrintTemplateSettingVo vo) { + PrintTemplate data = getById(vo.getId()); + if (data == null) { + throw new DefaultClientException("打印模板不存在！"); + } + + Wrapper updateWrapper = Wrappers.lambdaUpdate(PrintTemplate.class) + .eq(PrintTemplate::getId, vo.getId()) + .set(PrintTemplate::getTemplateJson, vo.getTemplateJson()); + + getBaseMapper().update(updateWrapper); + } + + @OpLog(type = BaseDataOpLogType.class, name = "修改打印模板示例数据，ID：{}", params = { + "#vo.id"}, autoSaveParams = true) + @Transactional(rollbackFor = Exception.class) + @Override + public void updateDemoData(UpdatePrintTemplateDemoDataVo vo) { + PrintTemplate data = getById(vo.getId()); + if (data == null) { + throw new DefaultClientException("打印模板不存在！"); + } + + Wrapper updateWrapper = Wrappers.lambdaUpdate(PrintTemplate.class) + .eq(PrintTemplate::getId, vo.getId()) + .set(PrintTemplate::getDemoData, vo.getDemoData()); + + getBaseMapper().update(updateWrapper); + } + + @Override + public void cleanCacheByKey(Serializable key) { + + } +} 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 cfa320e8748d64fe476a8b826e485fb5c2283295..7bc2ec66905c9c25e5c1380f8b5dcca38ef3b94a 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 @@ -7,17 +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.core.annotations.OpLog; +import com.lframework.starter.web.core.annotations.oplog.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.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.OpLogUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.mappers.ProductBrandMapper; import com.lframework.xingyun.basedata.service.product.ProductBrandService; @@ -26,7 +25,6 @@ import com.lframework.xingyun.basedata.vo.product.brand.QueryProductBrandSelecto import com.lframework.xingyun.basedata.vo.product.brand.QueryProductBrandVo; import com.lframework.xingyun.basedata.vo.product.brand.UpdateProductBrandVo; import java.io.Serializable; -import java.util.Collection; import java.util.List; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -74,7 +72,7 @@ public class ProductBrandServiceImpl extends BaseMpServiceImpl batchIds = new ArrayList<>(); batchIds.add(id); List nodeChildIds = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); if (CollectionUtil.isNotEmpty(nodeChildIds)) { batchIds.addAll(nodeChildIds); } @@ -75,7 +74,7 @@ public class ProductCategoryServiceImpl extends getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品分类，ID：{}", params = "#id") + @OpLog(type = BaseDataOpLogType.class, name = "启用商品分类，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override public void enable(String id) { @@ -83,7 +82,7 @@ public class ProductCategoryServiceImpl extends List batchIds = new ArrayList<>(); batchIds.add(id); List nodeParentIds = recursionMappingService.getNodeParentIds(id, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); if (CollectionUtil.isNotEmpty(nodeParentIds)) { batchIds.addAll(nodeParentIds); } @@ -93,7 +92,7 @@ public class ProductCategoryServiceImpl extends getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增商品分类，ID：{}, 编号：{}", params = {"#id", + @OpLog(type = BaseDataOpLogType.class, name = "新增商品分类，ID：{}, 编号：{}", params = {"#id", "#code"}) @Transactional(rollbackFor = Exception.class) @Override @@ -143,7 +142,7 @@ public class ProductCategoryServiceImpl extends return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改商品分类，ID：{}, 编号：{}", params = {"#id", + @OpLog(type = BaseDataOpLogType.class, name = "修改商品分类，ID：{}, 编号：{}", params = {"#id", "#code"}) @Transactional(rollbackFor = Exception.class) @Override @@ -205,18 +204,18 @@ public class ProductCategoryServiceImpl extends if (!StringUtil.isBlank(parentId)) { List parentIds = recursionMappingService.getNodeParentIds(parentId, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); if (CollectionUtil.isEmpty(parentIds)) { parentIds = new ArrayList<>(); } parentIds.add(parentId); recursionMappingService.saveNode(categoryId, - ApplicationUtil.getBean(ProductCategoryNodeType.class), + ProductCategoryNodeType.class, parentIds); } else { recursionMappingService.saveNode(categoryId, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); } } 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 5535508d305741e41563b03642ddc276ae73531f..4cfff844000b741134064d0d59e8a1b1f2fb8e36 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,14 +8,14 @@ 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.core.annotations.OpLog; +import com.lframework.starter.web.core.annotations.oplog.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.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.OpLogUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductProperty; import com.lframework.xingyun.basedata.entity.ProductPropertyItem; import com.lframework.xingyun.basedata.mappers.ProductPropertyItemMapper; @@ -70,7 +70,7 @@ public class ProductPropertyItemServiceImpl extends BaseMpServiceImpl children = recursionMappingService.getNodeChildIds(categoryId, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); if (!CollectionUtil.isEmpty(children)) { childCategoryIds.addAll(children); } @@ -138,7 +137,7 @@ public class ProductPropertyServiceImpl extends return results; } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增商品属性，ID：{}, 编号：{}", params = {"#id", + @OpLog(type = BaseDataOpLogType.class, name = "新增商品属性，ID：{}, 编号：{}", params = {"#id", "#code"}) @Transactional(rollbackFor = Exception.class) @Override @@ -205,7 +204,7 @@ public class ProductPropertyServiceImpl extends return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改商品属性，ID：{}, 编号：{}", params = {"#id", + @OpLog(type = BaseDataOpLogType.class, name = "修改商品属性，ID：{}, 编号：{}", params = {"#id", "#code"}) @Transactional(rollbackFor = Exception.class) @Override @@ -350,7 +349,7 @@ public class ProductPropertyServiceImpl extends public List getModelorByCategoryId(String categoryId) { List parentCategoryIds = recursionMappingService.getNodeParentIds(categoryId, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); + ProductCategoryNodeType.class); List categoryIds = new ArrayList<>(parentCategoryIds); categoryIds.add(categoryId); List datas = getBaseMapper().getModelorByCategoryId(categoryIds); 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 57c44c9bd7ddb317695ad8dd5558ab93af087760..1a3624c6caee8b045aa390dfbb3eb5f67b5ff4bd 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,10 +2,10 @@ 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.core.annotations.OpLog; +import com.lframework.starter.web.core.annotations.oplog.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductPurchase; import com.lframework.xingyun.basedata.mappers.ProductPurchaseMapper; import com.lframework.xingyun.basedata.service.product.ProductPurchaseService; @@ -19,7 +19,7 @@ public class ProductPurchaseServiceImpl extends BaseMpServiceImpl implements ProductPurchaseService { - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "设置商品采购价，ID：{}, 采购价：{}", params = {"#vo.id", "#vo.price"}) + @OpLog(type = BaseDataOpLogType.class, name = "设置商品采购价，ID：{}, 采购价：{}", params = {"#vo.id", "#vo.price"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateProductPurchaseVo vo) { @@ -37,7 +37,7 @@ public class ProductPurchaseServiceImpl extends return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "设置商品采购价，ID：{}, 采购价：{}", params = {"#vo.id", "#vo.price"}) + @OpLog(type = BaseDataOpLogType.class, name = "设置商品采购价，ID：{}, 采购价：{}", params = {"#vo.id", "#vo.price"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateProductPurchaseVo vo) { 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 dbabf0eda966f0bfb3f4129d7627919440ac7e18..974a01841a18ee2e21b41657cdf3517f4f936ac7 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,10 +2,10 @@ 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.core.annotations.OpLog; +import com.lframework.starter.web.core.annotations.oplog.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductRetail; import com.lframework.xingyun.basedata.mappers.ProductRetailMapper; import com.lframework.xingyun.basedata.service.product.ProductRetailService; @@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; public class ProductRetailServiceImpl extends BaseMpServiceImpl implements ProductRetailService { - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "设置商品零售价，ID：{}, 零售价：{}", params = {"#vo.id", "#vo.price"}) + @OpLog(type = BaseDataOpLogType.class, name = "设置商品零售价，ID：{}, 零售价：{}", params = {"#vo.id", "#vo.price"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateProductRetailVo vo) { @@ -36,7 +36,7 @@ public class ProductRetailServiceImpl extends BaseMpServiceImpl implements ProductSaleService { - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "设置商品销售价，ID：{}, 销售价：{}", params = {"#vo.id", "#vo.price"}) + @OpLog(type = BaseDataOpLogType.class, name = "设置商品销售价，ID：{}, 销售价：{}", params = {"#vo.id", "#vo.price"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateProductSaleVo vo) { @@ -36,7 +36,7 @@ public class ProductSaleServiceImpl extends BaseMpServiceImpl ids) { @@ -160,7 +159,7 @@ public class ProductServiceImpl extends BaseMpServiceImpl ids) { @@ -174,7 +173,7 @@ public class ProductServiceImpl extends BaseMpServiceImpl children = new ArrayList<>(); for (String categoryId : categoryIds) { children.addAll(recursionMappingService.getNodeChildIds(categoryId, - ApplicationUtil.getBean(ProductCategoryNodeType.class))); + ProductCategoryNodeType.class)); } children.addAll(categoryIds); 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 69ac6a17782fb3bcca5d6884333d9e34e7dddf1d..7fa35a68b365ea2602d165df3bc157e911e8ac3d 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 @@ -9,14 +9,14 @@ 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.core.annotations.OpLog; +import com.lframework.starter.web.core.annotations.oplog.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.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.OpLogUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.mappers.ShopMapper; import com.lframework.xingyun.basedata.service.shop.ShopService; @@ -58,7 +58,7 @@ public class ShopServiceImpl extends BaseMpServiceImpl impleme return getBaseMapper().selectById(id); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增门店，ID：{}", params = {"#id"}) + @OpLog(type = BaseDataOpLogType.class, name = "新增门店，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateShopVo vo) { @@ -93,7 +93,7 @@ public class ShopServiceImpl extends BaseMpServiceImpl impleme return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改门店，ID：{}", params = {"#id"}) + @OpLog(type = BaseDataOpLogType.class, name = "修改门店，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateShopVo vo) { 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 7f789fee402722c7d7b35a857036cf193a40d34e..e43ea0fe3642dc727d56380d322ba2845b9845da 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 @@ -10,11 +10,11 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; 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.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.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.mappers.StoreCenterMapper; @@ -23,10 +23,10 @@ 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 com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; +import com.lframework.starter.web.core.utils.OpLogUtil; import java.io.Serializable; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +61,7 @@ public class StoreCenterServiceImpl extends BaseMpServiceImpl + * 打印模板组件 Mapper 接口 + *

+ * + * @author zmj + * @since 2025-01-28 + */ +public interface PrintTemplateCompMapper extends BaseMapper { + +} diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PrintTemplateMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PrintTemplateMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..e319419f67c8163847236562e6b634b67218a356 --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PrintTemplateMapper.java @@ -0,0 +1,31 @@ +package com.lframework.xingyun.basedata.mappers; + +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.xingyun.basedata.entity.PrintTemplate; +import com.lframework.xingyun.basedata.vo.print.QueryPrintTemplateVo; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 打印模板 Mapper 接口 + *

+ * + * @author zmj + * @since 2025-01-28 + */ +public interface PrintTemplateMapper extends BaseMapper { + + /** + * 查询列表 + * + * @param vo + * @return + */ + @Sorts({ + @Sort(value = "name", alias = "tb", autoParse = true), + }) + List query(@Param("vo") QueryPrintTemplateVo vo); +} 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 ee404c0728a02b164c8faeae1df7343d59450886..e5cb8d5979566e079d82d41640b2ad10bb150ef2 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 @@ -1,11 +1,11 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.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.core.annotations.sort.Sort; -import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.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/ProductBundleMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBundleMapper.java index 87a0e7b7df364512e5361e7fb2a40a3e494b74a2..ceaf540d6663c270227c4087b4ac9eca42deddd4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBundleMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBundleMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductBundle; /** 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 3de781ce7ac4ed663d2b8d4c4298e25623421ef2..e2560147a69aa9665710939314a336b4a6a81fba 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.vo.product.category.QueryProductCategorySelectorVo; import java.util.List; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryPropertyMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryPropertyMapper.java index 5608fbf28867cf7cae44e53018449a1599c65bc1..603babef2347ccad2825ad8e561e6977691fce10 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryPropertyMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryPropertyMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductCategoryProperty; import java.util.List; 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 64d785c3a8bc0dbefa5fcfb17f117c70b9cbcd9b..91107d7f8ba954e762025c8fe7ba1ad62b57173a 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 @@ -1,14 +1,14 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.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.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 com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -28,7 +28,7 @@ public interface ProductMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -55,7 +55,7 @@ public interface ProductMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyItemMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyItemMapper.java index c0333621e30f034afdc33e64f778717610308851..9dbb51083d57bb46851c3d8166ee9747e47ef929 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyItemMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyItemMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductPropertyItem; import com.lframework.xingyun.basedata.vo.product.property.item.QueryProductPropertyItemVo; import java.util.List; 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 8d5f7bf651b5690c3d177a1183a4a4783fb19af8..8d110c007d87f870b2d2e5c7400647f8b391a45f 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 @@ -1,11 +1,11 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.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.core.annotations.sort.Sort; -import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; import java.util.Collection; import java.util.List; import org.apache.ibatis.annotations.Param; 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 e7f72faa1ab503a3893c1680ed0706e271f81e68..1c1fa1bb351d0e2bbe798c38cd056ad3d72c9e70 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.dto.product.ProductPropertyRelationDto; import com.lframework.xingyun.basedata.entity.ProductPropertyRelation; import java.util.List; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPurchaseMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPurchaseMapper.java index 44e4ea9104637e8fcb31971404dd81bc1a2351d5..facedc3b75e95a1ddea649ef4d06f76fc78a162c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPurchaseMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPurchaseMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductPurchase; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductRetailMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductRetailMapper.java index d10e4295367b2b40b61f5aa055f9652e0b25a5a5..7aec026896db48278816645113694839b139180b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductRetailMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductRetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductRetail; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductSaleMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductSaleMapper.java index a9df969d69ec107ed9588650e256dc758f4d67be..212cc995cee836a3ceb3a7a8c5e1ac407df36012 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductSaleMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductSaleMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductSale; /** 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 ed01f6ca0fcec90c2800ba30347d34a448f012a4..67548cd7b7384a88dfb0964ca73907dc2fc6a3d1 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 @@ -1,10 +1,10 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.vo.shop.QueryShopVo; -import com.lframework.xingyun.core.annotations.sort.Sort; -import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.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 fe7ddb80ddf45237fd75d0e0a36029af3f906cad..341b5b0c3826ed9f8e3d7544fe5c062c2f585dd6 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 @@ -1,11 +1,11 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.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.core.annotations.sort.Sort; -import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.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 6613bd1348a060e1ff489676bd03efb077cb3368..98d8fa05d7a67d7d15fb71750a3f176c327acf15 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 @@ -1,11 +1,11 @@ package com.lframework.xingyun.basedata.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.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.core.annotations.sort.Sort; -import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.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/address/AddressService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/address/AddressService.java index 0958d5ac197a320afd192a79f2aa2c2cd6cbc3f2..f44676ccd557b00ec5daf405c142c507410e2444 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/address/AddressService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/address/AddressService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.address; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.vo.address.AddressSelectorVo; import com.lframework.xingyun.basedata.vo.address.CreateAddressVo; 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 2b3fca02513763c4afd5b1708f4deb6a4b42458d..2ce8b6a318b786db36801d4399502420bf0e4614 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 @@ -1,13 +1,12 @@ package com.lframework.xingyun.basedata.service.customer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.vo.customer.CreateCustomerVo; import com.lframework.xingyun.basedata.vo.customer.QueryCustomerSelectorVo; import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo; import com.lframework.xingyun.basedata.vo.customer.UpdateCustomerVo; -import java.util.Collection; import java.util.List; public interface CustomerService extends BaseMpService { 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 aad67f854a0b5dad562a17f140835e7da8dfc773..d4ab340566016c21c4da5f8de7e2866c67aa6c9e 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 @@ -1,13 +1,12 @@ package com.lframework.xingyun.basedata.service.logistics; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.LogisticsCompany; 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 java.util.Collection; import java.util.List; public interface LogisticsCompanyService extends BaseMpService { 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 419ea852493c0830d0f40a64f9bdd30a9babcd70..ff9df49db9aca3ebb55bf922156c6b264e8a1f9d 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 @@ -1,13 +1,12 @@ package com.lframework.xingyun.basedata.service.member; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.Member; 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 java.util.Collection; import java.util.List; public interface MemberService extends BaseMpService { diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/paytype/PayTypeService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/paytype/PayTypeService.java index 1821fbfc9259316db6995ac75ba729ed1988a0ec..00dda8f4607a1e0a074b506838cd07a70a79318a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/paytype/PayTypeService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/paytype/PayTypeService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.paytype; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.vo.paytype.CreatePayTypeVo; import com.lframework.xingyun.basedata.vo.paytype.PayTypeSelectorVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/print/PrintTemplateCompService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/print/PrintTemplateCompService.java new file mode 100644 index 0000000000000000000000000000000000000000..67acd69f8c90918a590d30f1e4cae2f901ac8d89 --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/print/PrintTemplateCompService.java @@ -0,0 +1,11 @@ +package com.lframework.xingyun.basedata.service.print; + +import com.lframework.starter.web.core.service.BaseMpService; +import com.lframework.xingyun.basedata.entity.PrintTemplateComp; + +import java.util.List; + +public interface PrintTemplateCompService extends BaseMpService { + + List getCompJsonByTemplateId(Integer templateId); +} diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/print/PrintTemplateService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/print/PrintTemplateService.java new file mode 100644 index 0000000000000000000000000000000000000000..30a536c9b0539f3550edb64c38c36c346f4feb74 --- /dev/null +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/print/PrintTemplateService.java @@ -0,0 +1,66 @@ +package com.lframework.xingyun.basedata.service.print; + +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; +import com.lframework.xingyun.basedata.entity.PrintTemplate; +import com.lframework.xingyun.basedata.vo.print.CreatePrintTemplateVo; +import com.lframework.xingyun.basedata.vo.print.QueryPrintTemplateVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateDemoDataVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateSettingVo; +import com.lframework.xingyun.basedata.vo.print.UpdatePrintTemplateVo; +import java.util.List; + +public interface PrintTemplateService extends BaseMpService { + + /** + * 查询列表 + * + * @return + */ + PageResult query(Integer pageIndex, Integer pageSize, QueryPrintTemplateVo vo); + + /** + * 查询列表 + * + * @param vo + * @return + */ + List query(QueryPrintTemplateVo vo); + + /** + * 根据ID查询 + * + * @param id + * @return + */ + PrintTemplate findById(Integer id); + + /** + * 创建 + * + * @param vo + * @return + */ + Integer create(CreatePrintTemplateVo vo); + + /** + * 修改 + * + * @param vo + */ + void update(UpdatePrintTemplateVo vo); + + /** + * 保存设置 + * + * @param vo + */ + void updateSetting(UpdatePrintTemplateSettingVo vo); + + /** + * 保存示例数据 + * + * @param vo + */ + void updateDemoData(UpdatePrintTemplateDemoDataVo vo); +} 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 11287f3b3b4b4d266306e941446188cc4b766153..5c46f7d5ae507e8431e2e79c7810aead3aedb81a 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 @@ -1,13 +1,12 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.vo.product.brand.CreateProductBrandVo; import com.lframework.xingyun.basedata.vo.product.brand.QueryProductBrandSelectorVo; import com.lframework.xingyun.basedata.vo.product.brand.QueryProductBrandVo; import com.lframework.xingyun.basedata.vo.product.brand.UpdateProductBrandVo; -import java.util.Collection; import java.util.List; public interface ProductBrandService extends BaseMpService { diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBundleService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBundleService.java index 92747c214fb3cb42cfd38049547e9e8bf8c23595..6df3df0b46bfca04a3f4125d596a4bfdb5b3185d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBundleService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBundleService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductBundle; import java.util.List; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryPropertyService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryPropertyService.java index cea80a976a711406c004846ba308f81455abf3da..7dfbc2a7939f312765e197875da9f0040fd8ce25 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryPropertyService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryPropertyService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductCategoryProperty; import java.util.List; 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 a7a006fc59e0aa0d192273004300934abf5a0d16..1baa6b55abe6dbe909de6885934b21b2d6165eaf 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 @@ -1,11 +1,10 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductCategory; 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 java.util.Collection; import java.util.List; public interface ProductCategoryService extends BaseMpService { diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyItemService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyItemService.java index 22b0e726434b7048d830fbbcabc81015309fe612..b5e905c0e619d9fa6c4bb6c316979c212ff6620a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyItemService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyItemService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductPropertyItem; import com.lframework.xingyun.basedata.vo.product.property.item.CreateProductPropertyItemVo; import com.lframework.xingyun.basedata.vo.product.property.item.QueryProductPropertyItemVo; 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 2c5c62692c5549cfc589df6d6691124c75f9afa0..8f8c8478e7393e515ee3117da9205f52c9bee1ce 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.dto.product.ProductPropertyRelationDto; import com.lframework.xingyun.basedata.entity.ProductPropertyRelation; import com.lframework.xingyun.basedata.vo.product.property.realtion.CreateProductPropertyRelationVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyService.java index ad18128c895bea6b99d12d3c2ddfb28d2c54adbe..dcd70b145a9996b1cb44e23520fa1674228ad36a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.dto.product.property.ProductPropertyModelorDto; import com.lframework.xingyun.basedata.entity.ProductProperty; import com.lframework.xingyun.basedata.vo.product.property.CreateProductPropertyVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPurchaseService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPurchaseService.java index 5e512ad11d73c666221e91a833eb2f1ed1c798c5..7fcb95778cd5b13e90a9e3d8d8bc840a95be7402 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPurchaseService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPurchaseService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductPurchase; import com.lframework.xingyun.basedata.vo.product.purchase.CreateProductPurchaseVo; import com.lframework.xingyun.basedata.vo.product.purchase.UpdateProductPurchaseVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductRetailService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductRetailService.java index 39f0c1be6fad22c43f7ad20bc8419de8cffdfbf3..7af45acf7074386b61e93fb6d14e3d528ca98adf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductRetailService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductRetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductRetail; import com.lframework.xingyun.basedata.vo.product.retail.CreateProductRetailVo; import com.lframework.xingyun.basedata.vo.product.retail.UpdateProductRetailVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductSaleService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductSaleService.java index f4ee2a698911487918284de71861a05eb2a8d8c8..24524bcd38b04c997c509a38972837a0bcabbbaf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductSaleService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductSaleService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.ProductSale; import com.lframework.xingyun.basedata.vo.product.sale.CreateProductSaleVo; import com.lframework.xingyun.basedata.vo.product.sale.UpdateProductSaleVo; 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 e1e8f9d8506cbcccdad429597f2680f80490cef3..ce32a47f5ec3960fc094313452278a38b5a1a1fb 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.product; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.vo.product.info.CreateProductVo; import com.lframework.xingyun.basedata.vo.product.info.QueryProductSelectorVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/shop/ShopService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/shop/ShopService.java index 21a8c616075d69dfe1073ef8c32bd4935a663457..7701dd8c6341690fc963dbcff4a91f31b0351cd6 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/shop/ShopService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/shop/ShopService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.shop; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.vo.shop.CreateShopVo; import com.lframework.xingyun.basedata.vo.shop.QueryShopVo; 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 0eee69dee7cea0218a71a767429c8665588cc0f8..964717f045bf6e9c9c6e4ffa639bc3a1833790bb 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.service.storecenter; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.vo.storecenter.CreateStoreCenterVo; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterSelectorVo; 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 d9b6784c0d920f37ff8eac82e48f45bdc67ed6a0..12976813cea7d6b82132cee1594dd6702742f513 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 @@ -1,13 +1,12 @@ package com.lframework.xingyun.basedata.service.supplier; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.basedata.entity.Supplier; 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 java.util.Collection; import java.util.List; public interface SupplierService extends BaseMpService { diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/AddressSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/AddressSelectorVo.java index 42be251b87d3db6a6e11c751e71dff61cce688d7..88abccc93f5a694027fb26e6d088f7ffa6f55b4b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/AddressSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/AddressSelectorVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.address; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/CreateAddressVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/CreateAddressVo.java index ab70aa0906414e4a5e56b95f08e80f33674a72d6..4c68ec8bc349daa427d6309812ed6ffd95cb1bef 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/CreateAddressVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/CreateAddressVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.address; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/QueryAddressVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/QueryAddressVo.java index ea0558d944afe43c540c92f4e17592bc84649951..22e53d950adacb9949ad8fa893ea499f6a7fa4e0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/QueryAddressVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/QueryAddressVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.address; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/UpdateAddressVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/UpdateAddressVo.java index cbff811297266027885ae0eccac87283c170d446..6c95ebe229648d4c17b0d6fd17cf69fb4e9da664 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/UpdateAddressVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/address/UpdateAddressVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.address; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.AddressEntityType; import com.lframework.xingyun.basedata.enums.AddressType; import io.swagger.annotations.ApiModelProperty; 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 9965a38b67b474e71e4a5e3a1a66056e039cf20e..7de224d370ef0206767d3afbd3277f9f56a8102d 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.customer; -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.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.SettleType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerSelectorVo.java index f3cb9ff16b71ef9266ed86051b466249643e9bbc..91f3fc0c64f7700c36be3e145f481af865394431 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.customer; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerVo.java index 8196419a8df4cd478996497dfd71264177190a8f..05b3447719a3d68d608335acf96a3416f9365249 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/QueryCustomerVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.customer; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; 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 af755d40bef7d094ed0b4a52f1761d782a22be83..d992fddaf35b69e1789cfda8245b4106e296d88e 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.customer; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.Email; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/CreateLogisticsCompanyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/CreateLogisticsCompanyVo.java index d556f3b74063076240e7396ba638d2f71b74fd32..d1cea39630b1616fedb700e8921cef361375c89c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/CreateLogisticsCompanyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/CreateLogisticsCompanyVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.logistics.company; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanySelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanySelectorVo.java index 7fac9d21e2e9ce1e4ad974220c390059ac6a7217..98fd21b6bdd02a45bef4dd315fc42933aaaa78ba 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanySelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanySelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.logistics.company; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanyVo.java index 866d553a801f1b59b989540396b965a4e53e7038..08574a0bca6a7e441cf2ff9ad1edddf03228cd01 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/QueryLogisticsCompanyVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.logistics.company; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/UpdateLogisticsCompanyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/UpdateLogisticsCompanyVo.java index 6009bb95048ccf69061c3c3c8386eea978f3395c..316da391dfce76c228c9142429f8800e05642779 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/UpdateLogisticsCompanyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/logistics/company/UpdateLogisticsCompanyVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.logistics.company; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; 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 e5742e0822bb4fbbd4b53940d5dd2fca4d55fd0f..5ce3eaa76a0bd2516ce34fb36e45ac2288912633 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,9 +1,9 @@ package com.lframework.xingyun.basedata.vo.member; -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; +import com.lframework.starter.web.inner.enums.system.Gender; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberSelectorVo.java index a6a94a2953b6944af5b60baa07b7abf2f5ea0c3e..9ed935858e8967399527e5c04663353c8fe6fa70 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.member; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberVo.java index 5273d2b977f855cd2d5d42519ccfeb1f1bede0df..5f47739c2579f9d36a5372d00758c80a86c34eda 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/QueryMemberVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.member; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; 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 bbab90bbc2dc2eec73b4030e5015142e680f610b..15af7fdaa432b05b72363ce0f514e1e6ccdec484 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,9 +1,9 @@ package com.lframework.xingyun.basedata.vo.member; -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; +import com.lframework.starter.web.inner.enums.system.Gender; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/CreatePayTypeVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/CreatePayTypeVo.java index b86cc17c8b9b465b4f2dc784f9c9e4a7b87e7097..a87241ed1e6149e2bb921cdb3e3a8ff120bcc482 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/CreatePayTypeVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/CreatePayTypeVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.paytype; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/PayTypeSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/PayTypeSelectorVo.java index 3eca80aaddf028391182ffe0d0bf7347b4bfc86a..3ebf854c5f32ad84624ac2cf9635e7187b568541 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/PayTypeSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/PayTypeSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.paytype; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/QueryPayTypeVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/QueryPayTypeVo.java index 3249420b8269eedf0331014f2e2ff2ab06d5af39..04a4e68e04faf63bf3eb4e489d49aea10ec52740 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/QueryPayTypeVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/QueryPayTypeVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.paytype; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/UpdatePayTypeVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/UpdatePayTypeVo.java index b652eee1e6ab2139a8a71421e727de83af7050d7..e95708eb88415bd49561972297b36be895208b08 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/UpdatePayTypeVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/paytype/UpdatePayTypeVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.paytype; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/CreatePrintTemplateVo.java similarity index 46% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/CreatePrintTemplateVo.java index 0f2ed75c9572e44e936e6264abc4c09d79824243..fd2526950ffff3aacedda72292f51e5bccbf8534 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/CreatePrintTemplateVo.java @@ -1,25 +1,16 @@ -package com.lframework.xingyun.template.gen.vo.data.obj.category; +package com.lframework.xingyun.basedata.vo.print; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; import lombok.Data; @Data -public class CreateGenDataObjCategoryVo implements BaseVo, Serializable { +public class CreatePrintTemplateVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - /** * 名称 */ diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/SysNotifyGroupSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/QueryPrintTemplateVo.java similarity index 46% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/SysNotifyGroupSelectorVo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/QueryPrintTemplateVo.java index c6ea92f930428281fd6531004c2bffc2b9f4e957..7e38627590bdeb8dfd798063b46f0d16f1c8eec7 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/SysNotifyGroupSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/QueryPrintTemplateVo.java @@ -1,13 +1,13 @@ -package com.lframework.xingyun.template.inner.vo.system.notify; +package com.lframework.xingyun.basedata.vo.print; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; @Data -public class SysNotifyGroupSelectorVo extends PageVo implements BaseVo, Serializable { +public class QueryPrintTemplateVo extends SortPageVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; @@ -16,10 +16,4 @@ public class SysNotifyGroupSelectorVo extends PageVo implements BaseVo, Serializ */ @ApiModelProperty("名称") private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; } diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateDemoDataVo.java similarity index 51% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateDemoDataVo.java index 98383defcee9695d922dff0aa198688578290fee..684fc9f77e8b7a23f9b27ee3ca282231d72f3c2a 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateDemoDataVo.java @@ -1,6 +1,6 @@ -package com.lframework.xingyun.template.inner.vo.system.open; +package com.lframework.xingyun.basedata.vo.print; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class UpdateSysOpenDomainSecretVo implements BaseVo, Serializable { +public class UpdatePrintTemplateDemoDataVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; @@ -17,12 +17,12 @@ public class UpdateSysOpenDomainSecretVo implements BaseVo, Serializable { */ @ApiModelProperty(value = "ID", required = true) @NotNull(message = "ID不能为空！") - private Long id; + private Integer id; /** - * Api密钥 + * 示例数据 */ - @ApiModelProperty(value = "Api密钥", required = true) - @NotBlank(message = "Api密钥不能为空！") - private String apiSecret; + @ApiModelProperty(value = "示例数据", required = true) + @NotBlank(message = "示例数据不能为空！") + private String demoData; } diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateSettingVo.java similarity index 44% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateSettingVo.java index 0af54b5c752be09e7efab3b0d621698e0b423d50..c1f1d10b9e1b629977342f3aa304e527e93ddbf7 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateSettingVo.java @@ -1,13 +1,14 @@ -package com.lframework.xingyun.template.gen.vo.gen; +package com.lframework.xingyun.basedata.vo.print; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class UpdateCreateColumnConfigVo implements BaseVo, Serializable { +public class UpdatePrintTemplateSettingVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; @@ -16,12 +17,12 @@ public class UpdateCreateColumnConfigVo implements BaseVo, Serializable { */ @ApiModelProperty(value = "ID", required = true) @NotNull(message = "ID不能为空！") - private String id; + private Integer id; /** - * 是否必填 + * 模板配置 */ - @ApiModelProperty(value = "是否必填", required = true) - @NotNull(message = "是否必填不能为空！") - private Boolean required; + @ApiModelProperty(value = "模板配置", required = true) + @NotBlank(message = "模板配置不能为空！") + private String templateJson; } diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/UpdateSysGenerateCodeVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateVo.java similarity index 62% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/UpdateSysGenerateCodeVo.java rename to xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateVo.java index ef21250a7c345e0515f5eb07306b0a8efe627e74..6e521d54b1ddd6466ecb2515fe9de34cdc15e613 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/UpdateSysGenerateCodeVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/print/UpdatePrintTemplateVo.java @@ -1,7 +1,6 @@ -package com.lframework.xingyun.template.inner.vo.system.generate; +package com.lframework.xingyun.basedata.vo.print; -import com.lframework.starter.web.components.validation.IsJsonArray; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; @@ -9,7 +8,7 @@ import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class UpdateSysGenerateCodeVo implements BaseVo, Serializable { +public class UpdatePrintTemplateVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; @@ -17,7 +16,7 @@ public class UpdateSysGenerateCodeVo implements BaseVo, Serializable { * ID */ @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") + @NotNull(message = "ID不能为空！") private Integer id; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/CreateProductBrandVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/CreateProductBrandVo.java index 6ac4b5c45f53957a06306da11508cfd03d9f698a..1716ae2ee592285129bcf87813e2619b15f8e207 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/CreateProductBrandVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/CreateProductBrandVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.brand; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.components.validation.UploadUrl; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.UploadUrl; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandSelectorVo.java index df1afbae8d52743e5118d6c3354275af4951da4b..06f1ad980cda024ebb028593d645f7732f31bedf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.brand; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandVo.java index cb86e1ed8fb744e7af5be726319ab46c02a0217f..2522f6bfc5b02ce6c458c1bd98b9949640bcd38d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/QueryProductBrandVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.brand; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/UpdateProductBrandVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/UpdateProductBrandVo.java index 19367d5867e6494f96a5b3aa031ae62cb688f5f9..3f92416dffe772935de5d9ed7773efadccbdfd37 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/UpdateProductBrandVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/brand/UpdateProductBrandVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.brand; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.components.validation.UploadUrl; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.UploadUrl; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/CreateProductCategoryVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/CreateProductCategoryVo.java index 27fa64971ba2a50f8207eb8d52428839a5a61767..d464e517dab690c648f2ee61714d2f26575c3eb5 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/CreateProductCategoryVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/CreateProductCategoryVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.category; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/QueryProductCategorySelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/QueryProductCategorySelectorVo.java index 89b1cd45e938d84245b6c15d45b7c21e65e57a29..95e881abca84da2cf707ea9be25126573d2bd1ba 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/QueryProductCategorySelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/QueryProductCategorySelectorVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.category; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/UpdateProductCategoryVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/UpdateProductCategoryVo.java index a00871d9f76b93cd30d358d82b5f624d1f35e018..2875f85a1632bf649af6faad5c64b7fa92287971 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/UpdateProductCategoryVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/category/UpdateProductCategoryVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.category; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; 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 6c8ff04d8a0efd9456d7a008468660cddc003011..0829fd078ef7297923366b606eb80489b0674318 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.info; -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.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.ProductType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -85,7 +85,6 @@ public class CreateProductVo implements BaseVo, Serializable { */ @ApiModelProperty(value = "进项税率（%）") @Min(value = 0, message = "进项税率（%）不允许小于0！") - @Digits(integer = 10, fraction = 0, message = "进项税率（%）必须为整数！") private BigDecimal taxRate = BigDecimal.ZERO; /** @@ -93,7 +92,6 @@ public class CreateProductVo implements BaseVo, Serializable { */ @ApiModelProperty(value = "销项税率（%）") @Min(value = 0, message = "销项税率（%）不允许小于0！") - @Digits(integer = 10, fraction = 0, message = "销项税率（%）必须为整数！") private BigDecimal saleTaxRate = BigDecimal.ZERO; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductBundleVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductBundleVo.java index 5ef188dd439301296abe1f1b4225b07a87f4e639..2ac0e01adcb565af429c665f4f2ad34aba0267b4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductBundleVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductBundleVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.info; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductPropertyRelationVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductPropertyRelationVo.java index ccff937c4a067b830c8ed672b49445d6d5c41ec0..952d09ff22efa84ff33f22b2b69c46438812d0fb 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductPropertyRelationVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/ProductPropertyRelationVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.info; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import java.io.Serializable; import javax.validation.constraints.NotBlank; import lombok.Data; 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 af3dcd385678c636dc675e9efff29b275a82835f..a22a375e2104caa8f1e0f3b44b3258925b79c733 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.info; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.basedata.enums.ProductType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; 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 ff776da3cd57b7c7fe9d388ed78cf9a52dc55c86..ebf1eafcddef445a4666a5da0ceeaf8f69a363c5 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.info; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.basedata.enums.ProductType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; 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 818351c6b5ea1f9f19093b5b77efefdd08dd5397..100b90fe79b185e4e3b7b8bb220f5f059d2778f3 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.info; -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.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.ProductType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -106,7 +106,6 @@ public class UpdateProductVo implements BaseVo, Serializable { */ @ApiModelProperty(value = "进项税率（%）") @Min(value = 0, message = "进项税率（%）不允许小于0！") - @Digits(integer = 10, fraction = 0, message = "进项税率（%）必须为整数！") private BigDecimal taxRate = BigDecimal.ZERO; /** @@ -114,7 +113,6 @@ public class UpdateProductVo implements BaseVo, Serializable { */ @ApiModelProperty(value = "销项税率（%）") @Min(value = 0, message = "销项税率（%）不允许小于0！") - @Digits(integer = 10, fraction = 0, message = "销项税率（%）必须为整数！") private BigDecimal saleTaxRate = BigDecimal.ZERO; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/saleprop/CreateProductSalePropItemRelationVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/saleprop/CreateProductSalePropItemRelationVo.java index 3b4693aeca55121cb1933630785d411c63b0c27c..d0ed96f2946ee8e491ca4b5dd5a793fa10f15cc8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/saleprop/CreateProductSalePropItemRelationVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/saleprop/CreateProductSalePropItemRelationVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.info.saleprop; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; 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 b2253e5c65d20f30ed4442ce7881d285f57a55dc..31d8bfe37dd877f94ed31ec78d5b67fcde9dcabe 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 @@ -4,8 +4,8 @@ import com.lframework.starter.common.constants.PatternPool; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; 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 8b0521c91a5c38907006c7d00cb43b5274f8fcde..8db6681e6eaf8131644d69f200837b699eb2c435 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.poly; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; 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 0b15f220ff722ea412aef2d706f4bf4949007b16..ceac2783a2ee974cc88eca8fa411b79a51768a71 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.poly; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/property/CreateProductPolyPropertyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/property/CreateProductPolyPropertyVo.java index 1290547f002d63caba05e4ace6055a7bbb18c990..2f2dce192645e87753423caa05cca68b3621b8ae 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/property/CreateProductPolyPropertyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/property/CreateProductPolyPropertyVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.poly.property; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/saleprop/CreateProductPolySalePropGroupVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/saleprop/CreateProductPolySalePropGroupVo.java index 58bdfe2e10327db070e7c992d6fca84822c72df6..98fb2cc61846aca603a2e9f6fde41ef4961ba48d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/saleprop/CreateProductPolySalePropGroupVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/saleprop/CreateProductPolySalePropGroupVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.poly.saleprop; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import java.io.Serializable; import java.util.List; import lombok.Data; 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 6f66c3d5100bd61938cceda4c04b5ce30a971d4b..b3c75f170ce431222a9e9101365a1d7a3b718158 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.property; -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.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.ColumnDataType; import com.lframework.xingyun.basedata.enums.ColumnType; import com.lframework.xingyun.basedata.enums.PropertyType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/QueryProductPropertyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/QueryProductPropertyVo.java index a76ee154f204976485a48795307a5d0222bde64f..fa868e592745c079e1162a4750e9e99d0ab7e6c1 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/QueryProductPropertyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/QueryProductPropertyVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.property; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; 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 dcdb190d38db0c8be08f86ba7976d4f9b091f422..ce4fe19831f3c54733118288b7981c71685410a6 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.product.property; -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.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.ColumnDataType; import com.lframework.xingyun.basedata.enums.ColumnType; import com.lframework.xingyun.basedata.enums.PropertyType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/CreateProductPropertyItemVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/CreateProductPropertyItemVo.java index 1371df6fe654ecd006e96eb39c71b30c86d390b0..86b3f00062df7f36140248d4bfa70c91b8fd6a0e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/CreateProductPropertyItemVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/CreateProductPropertyItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.property.item; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/QueryProductPropertyItemVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/QueryProductPropertyItemVo.java index d425625790f81dbb201c4fa2e321045671c5603e..0289806302ec54aec311bf044b4bc1748806d78c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/QueryProductPropertyItemVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/QueryProductPropertyItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.property.item; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/UpdateProductPropertyItemVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/UpdateProductPropertyItemVo.java index ee5da9da7d7c777c65bc7754ad098ae6824af1b7..5ef3f32a904fd011f89278aada468a6f5fd6c119 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/UpdateProductPropertyItemVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/item/UpdateProductPropertyItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.property.item; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/realtion/CreateProductPropertyRelationVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/realtion/CreateProductPropertyRelationVo.java index f045571817021a84351fb9641de626d55fffcd21..b7340bc7e71bdad98f98b790b6c24d2e6be126bd 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/realtion/CreateProductPropertyRelationVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/realtion/CreateProductPropertyRelationVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.property.realtion; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/CreateProductPurchaseVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/CreateProductPurchaseVo.java index 62c1d717c36f7fd1d9a26001bdafde9772453b75..428f1258f71ad874aaec01dee6f587bbb6fbd626 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/CreateProductPurchaseVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/CreateProductPurchaseVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.purchase; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/UpdateProductPurchaseVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/UpdateProductPurchaseVo.java index a0e8ed00b8fb6c6283b1fc9e6e97661f78278b23..e90bd533b5bf0bd6cf3bdec3f6381bb9b2a947f6 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/UpdateProductPurchaseVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/purchase/UpdateProductPurchaseVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.purchase; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/CreateProductRetailVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/CreateProductRetailVo.java index f1431a2c0d4c9db45671f913bf2586708a76adb4..ae3c5fa2895811f5852060b02ab3bb0131c54845 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/CreateProductRetailVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/CreateProductRetailVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.retail; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/UpdateProductRetailVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/UpdateProductRetailVo.java index 1cf1e390e1e85acd06354d367659191c82ca229c..a5af6ee3ed8700ee359e22cbab76686f0a8bd681 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/UpdateProductRetailVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/retail/UpdateProductRetailVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.retail; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/CreateProductSaleVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/CreateProductSaleVo.java index a3c1c7848cf8f16a43962d716c9f5e583be5cbbe..c33f1274dff19cddeffbc5fe6f268c0bfec06162 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/CreateProductSaleVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/CreateProductSaleVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.sale; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/UpdateProductSaleVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/UpdateProductSaleVo.java index 0220a93b342ffc0cecf10be24bf7ed621c5d1f96..5407e2b899bd1face44012c51ee1810f7997bad8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/UpdateProductSaleVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/sale/UpdateProductSaleVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.product.sale; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/CreateProductSalePropGroupVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/CreateProductSalePropGroupVo.java index 54fb1586262fc640d7eb6c431bc37b00154c6fb1..d12cd87c7c2d52b18114ce4b137554d893a807c7 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/CreateProductSalePropGroupVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/CreateProductSalePropGroupVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupSelectorVo.java index 569086e20c9694c59d4b6bce06f77e900073fff2..035f82a4133e18b33c6295cd9c55d9b23f54ba83 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupVo.java index 9a14f15c34281bc80a7002d7497bb34884c62e1c..c2b822a397076309874867f8bdcdbb0c4aa1508b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/QueryProductSalePropGroupVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/UpdateProductSalePropGroupVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/UpdateProductSalePropGroupVo.java index 2f95d05549cce2b7743f2b4378c8bebc6bc62687..83657533c1c8f34c8f23caad2cb45f7edf633e0c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/UpdateProductSalePropGroupVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/UpdateProductSalePropGroupVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/CreateProductSalePropItemVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/CreateProductSalePropItemVo.java index 9e0547425542a1c6176e03073cd997a06b78c338..c25d4f832c4ea3577bc0c21e94470a97e6738f09 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/CreateProductSalePropItemVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/CreateProductSalePropItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop.item; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemSelectorVo.java index 123869fd5549be24567ffc6c76863f9b1761f7ce..bb7c5ad98be2a2629326b9d3e0f757480ff68405 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop.item; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemVo.java index 697594659cfb98b2eb5eaee324bbc52dfda82e01..2bf92230f215dfe3abd37237d6bd9b1b1bf03034 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/QueryProductSalePropItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop.item; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/UpdateProductSalePropItemVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/UpdateProductSalePropItemVo.java index 7e4ba76cdabb02dd3a513801ce4e128958a6407d..dc420cda369d15150a02cf438f648e47fad74112 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/UpdateProductSalePropItemVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/saleprop/item/UpdateProductSalePropItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.product.saleprop.item; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/CreateShopVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/CreateShopVo.java index e97b575c5f6759589e441154c1e44fff89da4410..6a3fa70d98347cbd7a5f265c577a574db2c6df20 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/CreateShopVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/CreateShopVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.shop; -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.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/QueryShopVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/QueryShopVo.java index fd83b648eae9067e86aac71e34cedffb8053b5a0..368e4c902de650b850aa1d67bbc5c7a1d493a404 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/QueryShopVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/QueryShopVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.shop; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/ShopSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/ShopSelectorVo.java index 15e3f3b7a3e723e42429f0e4403a8cd3b4b43d15..ccaba99ff6b288facd26605d7925753ccf4e0fb9 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/ShopSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/ShopSelectorVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.shop; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/UpdateShopVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/UpdateShopVo.java index 063b3767de913aa1d89ac7b9912570d319e50d02..3c9c017088d9cd6d59bfd59d1e4c37ccec517107 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/UpdateShopVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/shop/UpdateShopVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.shop; -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.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/CreateStoreCenterVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/CreateStoreCenterVo.java index 53c7d7d7d4926bec025a61c9284e059d4ea384ac..016285778fddcd1e20abbffceb5a30e07bd8dbe0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/CreateStoreCenterVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/CreateStoreCenterVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.storecenter; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterSelectorVo.java index 16021c087d025234f6e16e46fbccc7c272263d7d..e17c7acbb2b8f5e4f5f1bc1300da054423a384be 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.storecenter; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterVo.java index c25cb9976100e6975fb6746cf300e6646ef5e376..8385fa1b170700c6ac526f2f761906eb24c7c7c3 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/QueryStoreCenterVo.java @@ -1,8 +1,7 @@ package com.lframework.xingyun.basedata.vo.storecenter; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/UpdateStoreCenterVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/UpdateStoreCenterVo.java index 536e326bebaacfbbd475fb30192d0c7312123354..695b5d4c75e384482bfaf537d082c15077f08dee 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/UpdateStoreCenterVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/storecenter/UpdateStoreCenterVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.storecenter; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; 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 c25394dddf10af694b248023408c182e296cf371..a2e7a55aabaeb81e316afc931cb62ac536edd96c 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 @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.supplier; -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.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.ManageType; import com.lframework.xingyun.basedata.enums.SettleType; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierSelectorVo.java index fcdc685d5631b835a0a5c2e3a5121d81538cc8f4..0293290a4e5d7211b42acc4445447394a6fdfcb9 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierSelectorVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.basedata.vo.supplier; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.basedata.enums.ManageType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierVo.java index 834d4879262f0ce9273300c4950d8b143f8a9614..ca552b09c4b28a215c7d0c327f5522cd44e4d248 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/QuerySupplierVo.java @@ -1,8 +1,7 @@ package com.lframework.xingyun.basedata.vo.supplier; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; 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 bb02faa4223ec8045db4f39d904ace2b7a0c032e..451879abf5ce2e9b6390602e3d5e9e89cb5be1ee 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.vo.supplier; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.Email; diff --git a/xingyun-basedata/src/main/resources/mappers/print/PrintTemplateMapper.xml b/xingyun-basedata/src/main/resources/mappers/print/PrintTemplateMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..5837fc4485f1920af8718136fd41c96aa743fd2e --- /dev/null +++ b/xingyun-basedata/src/main/resources/mappers/print/PrintTemplateMapper.xml @@ -0,0 +1,21 @@ + + + + + + SELECT + tb.* + FROM tbl_print_template AS tb + + + diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthBo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthBo.java index e0839a39a13ad2098160dae171950709e60e3c9f..c0f684529e87947da5efe9e6d54a2467ece3416e 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthBo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.bo; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthSumBo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthSumBo.java index 7b632c1bedd832f5c306b479dbff3dc9d3f95e41..874db5861ea275f847b305f8a4c99685a88cafd9 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthSumBo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartSameMonthSumBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.bo; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.chart.dto.OrderChartSumDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodayBo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodayBo.java index d35d0f63e2e5738f5a1e6312aaf2ba94245b0957..c4124b8c66301ee3d02c90d466f75985b7c47eb8 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodayBo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodayBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.bo; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.chart.dto.OrderChartTodayDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodaySumBo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodaySumBo.java index 4b802652525429bfc5c8b9e4d23f7538b8c49878..d37fbd5c13b0b16b7949693cf03c52a31f9a5487 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodaySumBo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartTodaySumBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.bo; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.chart.dto.OrderChartSumDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/controller/ChartController.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/controller/ChartController.java index 29d5e27a1d70f83c95a36de406a0c27911667586..3203c088b0533cfe8b41ce1610d3c0b7dbb9ca95 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/controller/ChartController.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/controller/ChartController.java @@ -1,10 +1,10 @@ package com.lframework.xingyun.chart.controller; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.bo.BaseBo; -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.core.bo.BaseBo; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.chart.bo.OrderChartSameMonthBo; import com.lframework.xingyun.chart.bo.OrderChartSameMonthSumBo; import com.lframework.xingyun.chart.bo.OrderChartTodayBo; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSameMonthDto.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSameMonthDto.java index 7c9f029bfe3b663f48639723f91b560eb253631e..de18bf87280c8eddcfe5cb46b0e64f2b02ba71f8 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSameMonthDto.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSameMonthDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.dto; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSumDto.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSumDto.java index e4a30e03a25419903d1b315823d012761d99a675..c38c2188815eac5681ba2199fbb4596d8471a828 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSumDto.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartSumDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.dto; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartTodayDto.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartTodayDto.java index b250f6cfc1d81baa3aa24dee723e72387944c752..07f5b62b34ad100ba3e3b16a8f60410a004ced1a 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartTodayDto.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartTodayDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.dto; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/entity/OrderChart.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/entity/OrderChart.java index 545c65d6331f1793d24ed7e45c37e4fe143d6aab..b508630f849c101eeed3dc9719c571b54d832116 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/entity/OrderChart.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/entity/OrderChart.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.chart.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.chart.enums.OrderChartBizType; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/enums/OrderChartBizType.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/enums/OrderChartBizType.java index 46abe19b6bdb142ec05d8d46b1d142f1251d0572..838e360877f3714aed259b52669abacdd7347f46 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/enums/OrderChartBizType.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/enums/OrderChartBizType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.chart.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum OrderChartBizType implements BaseEnum { PURCHASE_ORDER(0, "采购订单"), PURCHASE_RETURN(1, "采购退单"), SALE_ORDER(2, "销售订单"), SALE_RETURN(3, diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/impl/OrderChartServiceImpl.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/impl/OrderChartServiceImpl.java index acd31ca76986d34f10dd4d5b2fab34844ac277f1..ed0b04e361d40757169c8fb3d93a9999110cbff4 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/impl/OrderChartServiceImpl.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/impl/OrderChartServiceImpl.java @@ -2,9 +2,9 @@ package com.lframework.xingyun.chart.impl; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto; import com.lframework.xingyun.chart.dto.OrderChartSumDto; import com.lframework.xingyun.chart.dto.OrderChartTodayDto; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java index 17b74e7db675ccb8e5c1c49613183ef0b083bdc9..73e5b8ea7b26ef5e6a433cdbbc84446ffba139ef 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java @@ -3,7 +3,7 @@ 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.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; import com.lframework.xingyun.core.queue.MqStringPool; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.ExchangeTypes; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/mappers/OrderChartMapper.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/mappers/OrderChartMapper.java index 58a7979c276c84ddb0dfa15bd9893a427cd770a9..0d6a781d6d117f98a9b8d5c4b8ae9377a2e0c162 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/mappers/OrderChartMapper.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/mappers/OrderChartMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto; import com.lframework.xingyun.chart.dto.OrderChartSumDto; import com.lframework.xingyun.chart.dto.OrderChartTodayDto; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/service/OrderChartService.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/service/OrderChartService.java index f2ba3a3bea81d1df52a7eca62fc724971a56725f..44a9f905a767d3bc55e46d50a39d9473912b3f43 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/service/OrderChartService.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/service/OrderChartService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto; import com.lframework.xingyun.chart.dto.OrderChartSumDto; import com.lframework.xingyun.chart.dto.OrderChartTodayDto; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/CreateOrderChartVo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/CreateOrderChartVo.java index 491f4a8955aaa65d5dc9c70245397b260b1980c0..76a2e1d34f916ed0633f2d6f95a8914c086c639e 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/CreateOrderChartVo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/CreateOrderChartVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.chart.vo; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.chart.enums.OrderChartBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/GetOrderChartVo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/GetOrderChartVo.java index 1f6ad89a3a28bc925c911fa5cf2198b89d127193..f07c87542c06efeeac79e7c3ab679a0fa4b1323b 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/GetOrderChartVo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/GetOrderChartVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.vo; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/QueryOrderChartVo.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/QueryOrderChartVo.java index 17dd6888153386e61c8585e8c606adf6fc4a6002..adfd6c9418d961b0c1c50424109b09cbcc216b4d 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/QueryOrderChartVo.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/vo/QueryOrderChartVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.chart.vo; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-comp/pom.xml b/xingyun-comp/pom.xml index 99835e0e3e1d63959e45ea5f824f5f6d1d99783e..72d295e41083aa8c059b034ae0e4e9d80f2bd0d4 100644 --- a/xingyun-comp/pom.xml +++ b/xingyun-comp/pom.xml @@ -17,10 +17,6 @@ com.lframework xingyun-core - - com.lframework - xingyun-sys - \ No newline at end of file diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java index 002295a69f1f3483a7898a38438e3aae329c4d3e..0e6476eb989c344aaa922f6e00ac107af1b5791a 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.bo.components; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java index 26dd46947902b0f7dce85c79878d20d558ef0f32..867fc5d5664857b2dcb5014a3a0839a65ced3f5e 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.comp.bo.components; 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.OrderTimeLine; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.inner.entity.OrderTimeLine; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; @@ -62,6 +62,6 @@ public class OrderTimeLineBo extends BaseBo { @Override protected void afterInit(OrderTimeLine dto) { - this.bizType = dto.getBizType().getCode(); + this.bizType = dto.getBizType(); } } diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java index d95bf6bad312a5d0cb76a225e922e3c66e3a3cd9..9fbce6c37d5f8aaa5e21937d7a71aa6ca24075ae 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.bo.dic; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java index bd5e112a7cdf602c84bb2f0e87099433a644d231..16f7962db0dff4957f55305b0f9000fa8ef1e5f2 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java @@ -2,7 +2,7 @@ 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.starter.web.core.bo.BaseBo; import com.lframework.xingyun.comp.entity.OnlineExcel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java index 65970926567b937e713776925ecfa21ef81c5830..824f431cb1b5393576f604eb12a728195d47a86d 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java @@ -2,7 +2,7 @@ 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.starter.web.core.bo.BaseBo; import com.lframework.xingyun.comp.entity.OnlineExcel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java index 1c19c6367f00bee0d8c8761192a5bcb193408f87..e5dfcfba8ced4ae7e7cc883d897197d5e6341622 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java @@ -2,8 +2,8 @@ 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.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.comp.entity.FileBox; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java index e9334b2beebd7bb293617ab4a6bd19d502833913..dbec3b6c1688b4f855243a1a248704609dc57d17 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.bo.sw.filebox; -import com.lframework.starter.web.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.comp.entity.FileBox; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SecurityDownloadController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SecurityDownloadController.java index 4ef9114a248f896e8d2369d8c78b0d6ee5cd137a..36376db7a7301f2327b4245343001b9c28f3cc49 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SecurityDownloadController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SecurityDownloadController.java @@ -2,14 +2,14 @@ package com.lframework.xingyun.comp.controller; import com.lframework.starter.common.exceptions.impl.AccessDeniedException; import com.lframework.starter.common.utils.FileUtil; -import com.lframework.starter.web.components.redis.RedisHandler; -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.ResponseUtil; -import com.lframework.starter.web.utils.UploadUtil; -import com.lframework.xingyun.core.entity.SecurityUploadRecord; -import com.lframework.xingyun.core.service.SecurityUploadRecordService; +import com.lframework.starter.web.core.components.redis.RedisHandler; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.utils.ResponseUtil; +import com.lframework.starter.web.core.utils.UploadUtil; +import com.lframework.starter.web.inner.entity.SecurityUploadRecord; +import com.lframework.starter.web.inner.service.SecurityUploadRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java index eb933aa647357788b7dbcc17331dfe777a474a21..f794ebfdc7fedbbddb63b58d3a0cf83fc830a5cf 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java @@ -1,12 +1,12 @@ 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.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; 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 com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java index 656b1aef1dbb747ba56fdf8c0e00cfc52bcc6394..9f867578f695a4a093ab1ff2d483c0fd1c51ba9a 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java @@ -6,20 +6,20 @@ import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.FileUtil; -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.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.starter.web.core.bo.ExcelImportBo; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.inner.service.SysConfService; +import com.lframework.starter.web.core.utils.ExcelImportUtil; +import com.lframework.starter.web.core.utils.HttpUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.web.core.utils.UploadUtil; 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.GenerateCodeService; -import com.lframework.xingyun.core.service.OrderTimeLineService; +import com.lframework.starter.web.inner.entity.OrderTimeLine; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.inner.service.OrderTimeLineService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java index 484b0809a2afbf1b31a1c66d47ecdf4090da129c..171655873da66c5650d9df1527c30bdcc98cb316 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java @@ -2,11 +2,11 @@ package com.lframework.xingyun.comp.controller.sw; import com.lframework.starter.common.exceptions.impl.DefaultClientException; 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.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; 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; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java index 681bbe2ae79c8af22c5acc22dc871615d379dc0d..7a1cb043449bed92daacee5c284453ac763506ec 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java @@ -2,12 +2,12 @@ package com.lframework.xingyun.comp.controller.sw; 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.controller.DefaultBaseController; -import com.lframework.starter.web.resp.InvokeResult; -import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.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; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java index dae26b9b26c0be9c3add55c744dfcb10fadf01c8..a4b68334f823ffa01bdaeba7d3f8e87b7416ca2e 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java @@ -3,8 +3,8 @@ 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.starter.web.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.comp.enums.FileBoxFileType; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java index d13e84b05de108a52a57b7e4b1c56cbfaada78db..b2664081bbae9839d43d5e0429778411e09ff27d 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java @@ -3,8 +3,8 @@ 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.starter.web.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java index 1048641938075d56645d3449411f6abc51f5400a..cf9998f8f45995f82998a0339dd4998559cdd74b 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum FileBoxFileType implements BaseEnum { DIR(0, "目录"), diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java index fed1064d842a10ac6d0c9270a8bc89a0f9c48839..1b1499a9a0a11769463b8307f94adfdac1505097 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.enums; -import com.lframework.xingyun.core.enums.NodeType; +import com.lframework.starter.web.inner.enums.system.NodeType; import java.io.Serializable; import org.springframework.stereotype.Component; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java index 44fef8175998729f5eb249531e1201c03b9ff8ba..9dc2751537da657709f6873508b60878f757b11d 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java @@ -1,7 +1,12 @@ package com.lframework.xingyun.comp.enums; -public interface SwOpLogType { +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; - // 便捷办公 - int SW = 4000; +@Component +public class SwOpLogType implements OpLogType { + @Override + public Integer getCode() { + return 4000; + } } 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 index 3c0ace1631355f7f3f688a4667ed04bf07163d93..291d02f2ca38360699af9b6fd89c52ff1b78897f 100644 --- 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 @@ -11,16 +11,17 @@ 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.components.security.SecurityUtil; -import com.lframework.starter.web.components.upload.client.dto.UploadDto; -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.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.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.components.upload.client.dto.UploadDto; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.utils.UploadUtil; +import com.lframework.starter.web.inner.service.RecursionMappingService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.comp.entity.FileBox; import com.lframework.xingyun.comp.enums.FileBoxFileType; import com.lframework.xingyun.comp.enums.FileBoxNodeType; @@ -31,10 +32,6 @@ 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.service.SecurityUploadRecordService; -import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -50,9 +47,6 @@ public class FileBoxServiceImpl extends @Autowired private RecursionMappingService recursionMappingService; - @Autowired - private SecurityUploadRecordService securityUploadRecordService; - @Override public PageResult query(Integer pageIndex, Integer pageSize, QueryFileBoxVo vo) { @@ -77,7 +71,7 @@ public class FileBoxServiceImpl extends return getBaseMapper().selectById(id); } - @OpLog(type = SwOpLogType.SW, name = "修改文件，ID：{}", params = {"#id"}) + @OpLog(type = SwOpLogType.class, name = "修改文件，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateFileBoxVo vo) { @@ -100,7 +94,7 @@ public class FileBoxServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SwOpLogType.SW, name = "删除文件，ID：{}", params = {"#id"}) + @OpLog(type = SwOpLogType.class, name = "删除文件，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public void deleteById(String id) { @@ -109,11 +103,11 @@ public class FileBoxServiceImpl extends delIds.add(id); List childIds = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(FileBoxNodeType.class)); + FileBoxNodeType.class); delIds.addAll(childIds); recursionMappingService.deleteNodeAndChildren(id, - ApplicationUtil.getBean(FileBoxNodeType.class)); + FileBoxNodeType.class); Wrapper deleteWrapper = Wrappers.lambdaQuery(FileBox.class) .in(FileBox::getId, delIds) @@ -121,7 +115,7 @@ public class FileBoxServiceImpl extends this.remove(deleteWrapper); } - @OpLog(type = SwOpLogType.SW, name = "创建文件夹，父级目录：{}，文件夹名称：{}", params = { + @OpLog(type = SwOpLogType.class, name = "创建文件夹，父级目录：{}，文件夹名称：{}", params = { "#vo.parentPath", "#vo.name"}) @Transactional(rollbackFor = Exception.class) @Override @@ -144,7 +138,7 @@ public class FileBoxServiceImpl extends if ("/".equals(vo.getParentPath())) { recursionMappingService.saveNode(dir.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); + FileBoxNodeType.class); } else { String path = vo.getParentPath().substring(0, vo.getParentPath().lastIndexOf("/") == 0 ? 1 : vo.getParentPath().lastIndexOf("/")); @@ -159,15 +153,15 @@ public class FileBoxServiceImpl extends } List parentIds = recursionMappingService.getNodeParentIds(fileBox.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); + FileBoxNodeType.class); parentIds.add(fileBox.getId()); recursionMappingService.saveNode(dir.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class), parentIds); + FileBoxNodeType.class, parentIds); } } - @OpLog(type = SwOpLogType.SW, name = "上传文件，父级目录：{}，文件名称：{}", params = { + @OpLog(type = SwOpLogType.class, name = "上传文件，父级目录：{}，文件名称：{}", params = { "#vo.path", "#vo.name"}) @Transactional(rollbackFor = Exception.class) @Override @@ -176,8 +170,7 @@ public class FileBoxServiceImpl extends UploadDto uploadDto = UploadUtil.upload(file, CollectionUtil.toList("filebox", SecurityUtil.getCurrentUser().getId()), true); - String recordId = securityUploadRecordService.create(uploadDto.getUploadType(), - uploadDto.getObjectName()); + String recordId = uploadDto.getSecurityUploadRecordId(); FileBox record = new FileBox(); record.setId(IdUtil.getId()); @@ -194,7 +187,7 @@ public class FileBoxServiceImpl extends if ("/".equals(vo.getPath())) { recursionMappingService.saveNode(record.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); + FileBoxNodeType.class); } else { String path = vo.getPath() .substring(0, vo.getPath().lastIndexOf("/") == 0 ? 1 : vo.getPath().lastIndexOf("/")); @@ -209,11 +202,11 @@ public class FileBoxServiceImpl extends } List parentIds = recursionMappingService.getNodeParentIds(fileBox.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); + FileBoxNodeType.class); parentIds.add(fileBox.getId()); recursionMappingService.saveNode(record.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class), parentIds); + FileBoxNodeType.class, parentIds); } } diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java index 4f3811fd775acace721ae8aba87d1a0c69827fbb..9c977e688cc1169322fe35a86b0d76ca91626875 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java @@ -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.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.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; 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.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.comp.enums.SwOpLogType; -import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -67,7 +67,7 @@ public class OnlineExcelServiceImpl extends return getBaseMapper().selectById(id); } - @OpLog(type = SwOpLogType.SW, name = "新增在线Excel，ID：{}", params = {"#id"}) + @OpLog(type = SwOpLogType.class, name = "新增在线Excel，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateOnlineExcelVo vo) { @@ -87,7 +87,7 @@ public class OnlineExcelServiceImpl extends return data.getId(); } - @OpLog(type = SwOpLogType.SW, name = "修改在线Excel，ID：{}", params = {"#id"}) + @OpLog(type = SwOpLogType.class, name = "修改在线Excel，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateOnlineExcelVo vo) { @@ -109,7 +109,7 @@ public class OnlineExcelServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SwOpLogType.SW, name = "修改在线Excel内容，ID：{}", params = {"#id"}) + @OpLog(type = SwOpLogType.class, name = "修改在线Excel内容，ID：{}", params = {"#id"}) @Transactional(rollbackFor = Exception.class) @Override public void updateContent(UpdateOnlineExcelContentVo vo) { @@ -132,7 +132,7 @@ public class OnlineExcelServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SwOpLogType.SW, name = "发送Excel文件，发送方{}, 接收方{}", params = {"#sender", + @OpLog(type = SwOpLogType.class, name = "发送Excel文件，发送方{}, 接收方{}", params = {"#sender", "#receiver"}) @Transactional(rollbackFor = Exception.class) @Override @@ -166,7 +166,7 @@ public class OnlineExcelServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SwOpLogType.SW, name = "批量发送Excel文件，发送方{}, 接收方{}", params = {"#sender", + @OpLog(type = SwOpLogType.class, name = "批量发送Excel文件，发送方{}, 接收方{}", params = {"#sender", "#receiver"}) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java index fe7a01f2fc9cac1c015f879768df0d48b8a47ffc..c950d45e04de4155936e4454897463674c02c64d 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.comp.entity.FileBox; import com.lframework.xingyun.comp.vo.sw.filebox.QueryFileBoxVo; import java.util.List; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java index ed5b882f5d71b72afe502983dade1e8d84a4abab..6fbb48314bed2efdba106e627b7218f794aaf3ba 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.comp.entity.OnlineExcel; import com.lframework.xingyun.comp.vo.sw.excel.QueryOnlineExcelVo; import java.util.List; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java index 6bbae09a4b5ff24ea6936a917529c8ed5989d8e3..6734a0fdcf7df18558c01e70bf3bf0db769830a9 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; 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; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java index 897fed58621d6b8ce75e885059a2543b128f1cef..f80ddd998bbd10e55a35b830a7c97c4ad810b667 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; 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; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java index b602285453b49a5544cffcc804aa3c56566cb730..7b216c90188112d085cde7a0c1ea153de76ba13c 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.vo.sw.excel; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java index 9fb569037ce22f4b77a0fd65bda589f2b1c605ce..5c01fd4a6008e104fee95d558447127e8d07d049 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.vo.sw.excel; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java index 3cb2854cc5ebe65d038e9f4f80d621f701f57cf5..ce0de631776d3efd9d89c68cd17ac5acbe1c1699 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.comp.vo.sw.excel; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java index 8a3560efd9ade67f6307955a03510dcff707926b..2c933e82f229a8df5b7651b62738e338868847ec 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.vo.sw.excel; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java index 888812d11114c348f51d5803041794e5fa4906a6..09a843ce1b8cc809f410238c24753f65a1baee25 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.vo.sw.excel; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java index fb54d0aa1d4b74ea64391d478362c15c7ee067c3..be317d478c61212d7f40970fe773b5281647c47b 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.vo.sw.excel; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java index 21957bd310d473b0fbf36e4cd4c6f87ef7fadda3..e0ca1463e3323ef3e8857e99da63855f0f7c2c71 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.comp.vo.sw.filebox; -import com.lframework.starter.web.components.validation.Pattern; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.Pattern; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java index 6f0ed25db9b0f0e3525c574af425592bb9179896..8547907a8bf8e6a6374509961eca6d3c6d5fcc8b 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java @@ -1,10 +1,9 @@ package com.lframework.xingyun.comp.vo.sw.filebox; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import javax.validation.constraints.NotBlank; import lombok.Data; @Data diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java index 7477e1e5bd81aea2d74fe07b12ca5f02bfa651eb..586ed3817b256cc89d23332c78fb93293c618fe0 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.vo.sw.filebox; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java index 0e2f07144e4ca5170898f08f5c1aaf02d84b31aa..9e40d5528d9c27b76f4255181fb632a9d566b661 100644 --- a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.comp.vo.sw.filebox; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-core/pom.xml b/xingyun-core/pom.xml index 756d9e001fb3429a16bcf42aa4ce39ae9ca46500..74a344ca3914eab4340fcdac5e724cf9333e54f2 100644 --- a/xingyun-core/pom.xml +++ b/xingyun-core/pom.xml @@ -13,14 +13,15 @@ 【${project.artifactId}】基础依赖 + com.lframework - websocket-starter + rabbitmq-starter com.lframework - rabbitmq-starter + bpm-starter diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OpLog.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OpLog.java deleted file mode 100644 index a2524cc6a23e82086ae9bfd75131e6ef84ac898b..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OpLog.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.lframework.xingyun.core.annotations; - -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; - -/** - * 系统日志注解 - *

- * 使用方法： 比如关于用户的日志可以分为“登录、退出登录” 此时type可以使用统一的字符串，这样可以将关于用户行为的日志全部查出 然后再根据不同的name将这些日志进一步细分 - * name同时也用于前端显示 在上述例子中，可以将type设置为“user.operation” 登录的name设置为“用户登录” 退出登录的name设置为“退出登录” - * - * @author zmj - */ -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface OpLog { - - /** - * 日志类型 用于做业务区分 - * - * @return - */ - int type(); - - /** - * 日志名称 需要填充参数部分用{}占位，会根据params的值进行填充 - * - * @return - */ - String name() default ""; - - /** - * 需要保存的参数 Spel表达式 - * - * @return - */ - String[] params() default {}; - - /** - * 是否循环填充日志名称 会将params中的collection循环format - * - * @return - */ - boolean loopFormat() default false; - - /** - * 是否自动保存参数 - * - * @return - */ - boolean autoSaveParams() default false; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OrderTimeLineLog.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OrderTimeLineLog.java deleted file mode 100644 index bc82bcdd1c1dba464ea35d7e3dcfbf5288937a54..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OrderTimeLineLog.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.lframework.xingyun.core.annotations; - -import com.lframework.xingyun.core.enums.OrderTimeLineBizType; -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; - -/** - * 单据时间轴记录 - * 如果出现嵌套那么以最外层的为准，不会进行嵌套隔离 - * @author zmj - */ -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface OrderTimeLineLog { - - /** - * 业务类型 - * - * @return - */ - OrderTimeLineBizType type() default OrderTimeLineBizType.NORMAL; - - /** - * 单据ID - * @return - */ - String[] orderId(); - - /** - * 内容 需要填充参数部分用{}占位，会根据params的值进行填充 - * - * @return - */ - String name() default ""; - - /** - * 需要保存的参数 Spel表达式 - * - * @return - */ - String[] params() default {}; - - /** - * 是否循环填充内容 会将params中的collection循环format - * - * @return - */ - boolean loopFormat() default false; - - /** - * 是否为删除操作 - * 如果为删除操作，那么忽略type、name、loopFormat，直接根据orderId进行删除操作 - * @return - */ - boolean delete() default false; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermission.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermission.java deleted file mode 100644 index 0eb45d1bb0a7b59e431cc3264bc3c15e3b910966..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermission.java +++ /dev/null @@ -1,17 +0,0 @@ -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 DataPermission { - - String template(); - - String alias(); -} 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 deleted file mode 100644 index 49d1ff69882feb5c564925bb366ada41a0f868f3..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissionGroup.java +++ /dev/null @@ -1,15 +0,0 @@ -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-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissions.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissions.java deleted file mode 100644 index a4c736de78fef8035f32679bbeef65539845128b..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissions.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lframework.xingyun.core.annotations.permission; - -import com.lframework.xingyun.core.components.permission.SysDataPermissionDataPermissionType; -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 DataPermissions { - - SysDataPermissionDataPermissionType type(); - - DataPermission[] value(); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sort.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sort.java deleted file mode 100644 index 61b7d03b0b94e6aa0f2ff6d10c13d1111c5d7037..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sort.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lframework.xingyun.core.annotations.sort; - -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 Sort { - - /** - * 传入列名 - * - * @return - */ - String value(); - - /** - * SQL列名 - * - * @return - */ - String alias() default ""; - - /** - * 是否自动解析 - *

- * 如果自动解析，那么alias只需要指定表的别名即可，会直接将alias和转为下划线的value拼接作为SQL列名 - * - * @return - */ - boolean autoParse() default false; -} \ No newline at end of file diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sorts.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sorts.java deleted file mode 100644 index fd47c5a59d2467d3f54e98299ce4f4f8d53b4ce3..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sorts.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.core.annotations.sort; - -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 Sorts { - - Sort[] value(); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OpLogAspector.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OpLogAspector.java deleted file mode 100644 index d6ff27c8342875b8d9356a306389259ba60baa56..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OpLogAspector.java +++ /dev/null @@ -1,195 +0,0 @@ -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.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; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.expression.EvaluationContext; -import org.springframework.stereotype.Component; - -/** - * OpLog切面 - * - * @author zmj - */ -@Slf4j -@Aspect -@Component -@ConditionalOnProperty(value = "op-logs.enabled", matchIfMissing = true) -public class OpLogAspector { - - @Pointcut("@annotation(com.lframework.xingyun.core.annotations.OpLog)") - public void opLogCutPoint() { - - } - - @Around(value = "opLogCutPoint()") - public Object opLog(ProceedingJoinPoint joinPoint) throws Throwable { - - try { - //生成logId，多层嵌套时，隔离不同bean的数据 - String logId = IdUtil.getUUID(); - OpLogUtil.init(logId); - - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); - - Object value = joinPoint.proceed(); - - if (currentUser == null) { - currentUser = SecurityUtil.getCurrentUser(); - } - - if (currentUser != null) { - try { - //获取方法的参数名和参数值 - MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); - List paramNameList = Arrays.asList(methodSignature.getParameterNames()); - List paramList = Arrays.asList(joinPoint.getArgs()); - - //将方法的参数名和参数值一一对应的放入上下文中 - EvaluationContext ctx = SpelUtil.buildContext(); - for (int i = 0; i < paramNameList.size(); i++) { - ctx.setVariable(paramNameList.get(i), paramList.get(i)); - } - - //将返回值放入上下文中 - ctx.setVariable("_result", value); - - Map variables = OpLogUtil.getVariables(); - if (!CollectionUtil.isEmpty(variables)) { - variables.forEach((k, v) -> { - ctx.setVariable(k, v); - }); - } - - // 解析SpEL表达式获取结果 - Object[] params; - OpLog opLog = methodSignature.getMethod().getAnnotation(OpLog.class); - if (!ArrayUtil.isEmpty(opLog.params())) { - params = new Object[opLog.params().length]; - for (int i = 0; i < opLog.params().length; i++) { - String param = opLog.params()[i]; - Object p = SpelUtil.parse(param, ctx); - params[i] = p; - } - } else { - params = new String[0]; - } - - List paramsList = new ArrayList<>(); - //循环format - if (opLog.loopFormat() && Arrays.stream(params).anyMatch(t -> t instanceof Collection)) { - String[] strParams = new String[params.length]; - //collectionIndex的索引 - List collectionIndexes = new ArrayList<>(); - for (int i = 0; i < params.length; i++) { - //先处理不是Collection的元素 - if (params[i] instanceof Collection) { - collectionIndexes.add(i); - continue; - } - strParams[i] = params[i] == null ? null : params[i].toString(); - } - - paramsList.add(strParams); - - if (!CollectionUtil.isEmpty(collectionIndexes)) { - //将所有的collection组合，例：collection1的size是2 collection2的size是3 则组合后的条数为2*3=6 - for (Integer collectionIndex : collectionIndexes) { - List tmpParamsList = new ArrayList<>(); - for (String[] paramsArr : paramsList) { - - Collection collection = (Collection) params[collectionIndex]; - for (Object o : collection) { - String[] tmp = new String[paramsArr.length]; - for (int j = 0; j < paramsArr.length; j++) { - if (j == collectionIndex) { - tmp[j] = o == null ? null : o.toString(); - } else { - tmp[j] = paramsArr[j]; - } - } - - tmpParamsList.add(tmp); - } - } - - paramsList.clear(); - paramsList.addAll(tmpParamsList); - } - } else { - paramsList.add(strParams); - } - } else { - String[] strParams = new String[params.length]; - for (int i = 0; i < params.length; i++) { - strParams[i] = params[i] == null ? null : params[i].toString(); - } - paramsList.add(strParams); - } - - List createOpLogsVoList = new ArrayList<>(); - for (String[] strArr : paramsList) { - String extra = OpLogUtil.getExtra(); - if (extra == null) { - if (opLog.autoSaveParams()) { - // 没有手动指定extra - if (CollectionUtil.isNotEmpty(paramNameList)) { - if (paramNameList.size() == 1) { - // 只有一个参数 - OpLogUtil.setExtra(ctx.lookupVariable(paramNameList.get(0))); - } else { - // 多个参数 - Map paramMap = new LinkedHashMap<>(paramNameList.size(), 1); - for (String paramName : paramNameList) { - paramMap.put(paramName, ctx.lookupVariable(paramName)); - } - OpLogUtil.setExtra(paramMap); - } - } - extra = OpLogUtil.getExtra(); - } - } - - String finalExtra = extra; - CreateOpLogsVo vo = new CreateOpLogsVo(); - vo.setName(StringUtil.format(opLog.name(), strArr)); - vo.setLogType(opLog.type()); - vo.setExtra(finalExtra); - vo.setIp(currentUser.getIp()); - createOpLogsVoList.add(vo); - } - - if (CollectionUtil.isNotEmpty(createOpLogsVoList)) { - OpLogUtil.addLogs(createOpLogsVoList); - } - OpLogUtil.submitLog(currentUser); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - return value; - } finally { - OpLogUtil.clear(); - } - } -} 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 deleted file mode 100644 index 1b67b556fdc097533f27fdfda5e22bcd8bc32893..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OrderTimeLineLogAspect.java +++ /dev/null @@ -1,224 +0,0 @@ -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.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.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.entity.OrderTimeLine; -import com.lframework.xingyun.core.service.OrderTimeLineService; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.expression.EvaluationContext; -import org.springframework.stereotype.Component; - -/** - * 单据时间轴切面 - * - * @author zmj - */ -@Slf4j -@Aspect -@Component -public class OrderTimeLineLogAspect { - - @Autowired - private DefaultSettingProperties defaultSettingProperties; - - private final ThreadLocal POOL = new InheritableThreadLocal<>(); - - @Pointcut("@annotation(com.lframework.xingyun.core.annotations.OrderTimeLineLog)") - public void orderTimeLineLogCutPoint() { - - } - - @Around(value = "orderTimeLineLogCutPoint()") - public Object orderTimeLineLog(ProceedingJoinPoint joinPoint) throws Throwable { - - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); - - String curUserId = - currentUser == null ? defaultSettingProperties.getDefaultUserId() : currentUser.getId(); - String curUserName = - currentUser == null ? defaultSettingProperties.getDefaultUserName() : currentUser.getName(); - - Object value = null; - - try { - if (POOL.get() != null) { - POOL.set(POOL.get() + 1); - // 如果出现嵌套，那么以最外层的为准，不进行嵌套隔离 - return joinPoint.proceed(); - } - - POOL.set(1); - - value = joinPoint.proceed(); - - try { - //获取方法的参数名和参数值 - MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); - List paramNameList = Arrays.asList(methodSignature.getParameterNames()); - List paramList = Arrays.asList(joinPoint.getArgs()); - - //将方法的参数名和参数值一一对应的放入上下文中 - EvaluationContext ctx = SpelUtil.buildContext(); - for (int i = 0; i < paramNameList.size(); i++) { - ctx.setVariable(paramNameList.get(i), paramList.get(i)); - } - - //将返回值放入上下文中 - ctx.setVariable("_result", value); - - // 解析SpEL表达式获取结果 - Object[] params; - OrderTimeLineLog orderTimeLineLog = methodSignature.getMethod() - .getAnnotation(OrderTimeLineLog.class); - if (!ArrayUtil.isEmpty(orderTimeLineLog.params())) { - params = new Object[orderTimeLineLog.params().length]; - for (int i = 0; i < orderTimeLineLog.params().length; i++) { - String param = orderTimeLineLog.params()[i]; - Object p = SpelUtil.parse(param, ctx); - params[i] = p; - } - } else { - params = new String[0]; - } - - List paramsList = new ArrayList<>(); - //循环format - if (orderTimeLineLog.loopFormat() && Arrays.stream(params) - .anyMatch(t -> t instanceof Collection)) { - String[] strParams = new String[params.length]; - //collectionIndex的索引 - List collectionIndexes = new ArrayList<>(); - for (int i = 0; i < params.length; i++) { - //先处理不是Collection的元素 - if (params[i] instanceof Collection) { - collectionIndexes.add(i); - continue; - } - strParams[i] = params[i] == null ? null : params[i].toString(); - } - - paramsList.add(strParams); - - if (!CollectionUtil.isEmpty(collectionIndexes)) { - //将所有的collection组合，例：collection1的size是2 collection2的size是3 则组合后的条数为2*3=6 - for (Integer collectionIndex : collectionIndexes) { - List tmpParamsList = new ArrayList<>(); - for (String[] paramsArr : paramsList) { - - Collection collection = (Collection) params[collectionIndex]; - for (Object o : collection) { - String[] tmp = new String[paramsArr.length]; - for (int j = 0; j < paramsArr.length; j++) { - if (j == collectionIndex) { - tmp[j] = o == null ? null : o.toString(); - } else { - tmp[j] = paramsArr[j]; - } - } - - tmpParamsList.add(tmp); - } - } - - paramsList.clear(); - paramsList.addAll(tmpParamsList); - } - } else { - paramsList.add(strParams); - } - } else { - String[] strParams = new String[params.length]; - for (int i = 0; i < params.length; i++) { - strParams[i] = params[i] == null ? null : params[i].toString(); - } - paramsList.add(strParams); - } - - Object[] orderIds; - if (!ArrayUtil.isEmpty(orderTimeLineLog.orderId())) { - orderIds = new Object[orderTimeLineLog.orderId().length]; - for (int i = 0; i < orderTimeLineLog.orderId().length; i++) { - String orderId = orderTimeLineLog.orderId()[i]; - Object p = SpelUtil.parse(orderId, ctx); - orderIds[i] = p; - } - } else { - orderIds = new String[0]; - } - - List orderIdList = new ArrayList<>(); - for (Object orderId : orderIds) { - if (orderId == null) { - continue; - } - - if (orderId instanceof Collection) { - Collection c = (Collection) orderId; - CollectionUtil.forEach(c, (item, index) -> orderIdList.add(item.toString())); - } - - orderIdList.add(orderId.toString()); - } - - if (orderTimeLineLog.delete()) { - for (String orderId : orderIdList) { - // 这里不异步，在同事务内执行 - OrderTimeLineService orderTimeLineService = ApplicationUtil.getBean( - OrderTimeLineService.class); - orderTimeLineService.deleteByOrder(orderId); - orderTimeLineService.cleanCacheByKey(orderId); - } - } else { - List records = new ArrayList<>(); - OrderTimeLineService orderTimeLineService = ApplicationUtil.getBean( - OrderTimeLineService.class); - for (String[] strArr : paramsList) { - for (String orderId : orderIdList) { - OrderTimeLine record = new OrderTimeLine(); - record.setId(IdUtil.getId()); - record.setOrderId(orderId); - record.setContent(StringUtil.format(orderTimeLineLog.name(), strArr)); - record.setCreateBy(curUserName); - record.setCreateById(curUserId); - record.setBizType(orderTimeLineLog.type()); - records.add(record); - } - } - if (CollectionUtil.isNotEmpty(records)) { - // 这里不异步，在同事务内执行 - orderTimeLineService.saveBatch(records); - orderTimeLineService.cleanCacheByKeys(orderIdList); - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } finally { - if (POOL.get() != null) { - POOL.set(POOL.get() - 1); - if (POOL.get() <= 0) { - POOL.remove(); - } - } - } - return value; - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/bo/print/A4ExcelPortraitPrintBo.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/bo/print/A4ExcelPortraitPrintBo.java deleted file mode 100644 index 374a1ede0ef02ca38387b6803e36781353850309..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/bo/print/A4ExcelPortraitPrintBo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.core.bo.print; - -import com.lframework.starter.web.bo.BasePrintBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - * Excel文件的A4纸纵向打印的默认设置 - */ -@Data -public class A4ExcelPortraitPrintBo> extends - BasePrintBo { - - public A4ExcelPortraitPrintBo(String templateName) { - - this(templateName, null); - } - - public A4ExcelPortraitPrintBo(String templateName, T data) { - - super(templateName, data); - - this.setOrient(2); - this.setPageHeight(2970); - this.setPageWidth(2100); - this.setPageName("A4"); - - this.setMarginTop(19.1D); - this.setMarginRight(17.8D); - this.setMarginBottom(19.1D); - this.setMarginLeft(17.8D); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/WebExceptionHandler.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/WebExceptionHandler.java deleted file mode 100644 index 41b40860f773a3ff19b082c0c539d150a0f2ceb7..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/WebExceptionHandler.java +++ /dev/null @@ -1,384 +0,0 @@ -package com.lframework.xingyun.core.components; - -import cn.dev33.satoken.exception.NotPermissionException; -import com.lframework.starter.common.exceptions.BaseException; -import com.lframework.starter.common.exceptions.ClientException; -import com.lframework.starter.common.exceptions.SysException; -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.utils.ApplicationUtil; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.resp.Response; -import com.lframework.starter.web.resp.ResponseErrorBuilder; -import com.lframework.starter.web.utils.ResponseUtil; -import java.util.Map; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.UnexpectedTypeException; -import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileUploadException; -import org.springframework.beans.TypeMismatchException; -import org.springframework.core.MethodParameter; -import org.springframework.http.HttpStatus; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.validation.BindException; -import org.springframework.validation.FieldError; -import org.springframework.validation.ObjectError; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.method.annotation.MethodArgumentConversionNotSupportedException; -import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; - -/** - * 异常处理器 - * - * @author zmj - */ -@Slf4j -@RestControllerAdvice -public class WebExceptionHandler { - - /** - * 处理系统异常 - * - * @param e - * @return - */ - @ExceptionHandler(ClientException.class) - public Response handle(ClientException e, HandlerMethod method) { - - this.logException(e, method); - - this.setResponseCode(e); - - return InvokeResultBuilder.fail(e); - } - - /** - * 处理系统异常 - * - * @param e - * @return - */ - @ExceptionHandler(SysException.class) - public Response handle(SysException e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new DefaultSysException(); - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - /** - * 处理传入参数类型转换错误异常 - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(UnexpectedTypeException.class) - public Response handle(UnexpectedTypeException e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new InputErrorException(); - - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - @ExceptionHandler(BindException.class) - public Response handle(BindException e, HandlerMethod method) { - - this.logException(e, method); - - InputErrorException exception = null; - - if (e.getErrorCount() > 0) { - ObjectError objectError = e.getAllErrors().get(0); - - if (objectError instanceof FieldError && "typeMismatch".equals(objectError.getCode())) { - String fieldName = ((FieldError) objectError).getField(); - - Class targetClazz = e.getBindingResult().getTarget().getClass(); - - TypeMismatch typeMismatch = null; - try { - typeMismatch = targetClazz.getDeclaredField(fieldName).getAnnotation(TypeMismatch.class); - } catch (NoSuchFieldException exp) { - throw new DefaultSysException(exp.getMessage()); - } - if (typeMismatch != null) { - exception = new InputErrorException(typeMismatch.message()); - } - } - } - if (exception == null) { - for (ObjectError error : e.getAllErrors()) { - exception = new InputErrorException(error.getDefaultMessage()); - break; - } - - if (exception == null) { - exception = new InputErrorException(); - } - } - - this.setResponseCode(exception); - - return getBuilder(method.getBean()).fail(exception); - } - - @ExceptionHandler(MethodArgumentNotValidException.class) - public Response methodArgumentNotValidException(MethodArgumentNotValidException e, - HandlerMethod method) { - - this.logException(e, method); - InputErrorException exception = null; - for (ObjectError error : e.getBindingResult().getAllErrors()) { - exception = new InputErrorException(error.getDefaultMessage()); - break; - } - - if (exception == null) { - throw new InputErrorException(); - } - - this.setResponseCode(exception); - - return getBuilder(method.getBean()).fail(exception); - } - - /** - * 处理未通过校验异常 - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(ConstraintViolationException.class) - public Response handle(ConstraintViolationException e, HandlerMethod method) { - - this.logException(e, method); - - InputErrorException exception = null; - for (ConstraintViolation constraintViolation : e.getConstraintViolations()) { - exception = new InputErrorException(constraintViolation.getMessage()); - break; - } - - if (exception == null) { - throw new InputErrorException(); - } - - this.setResponseCode(exception); - - return getBuilder(method.getBean()).fail(exception); - } - - /** - * 处理由于传入参数类型不匹配导致的异常 - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(TypeMismatchException.class) - public Response methodArgumentTypeMismatchException(TypeMismatchException e, - HandlerMethod method) { - - this.logException(e, method); - - MethodParameter methodParameter = null; - if (e instanceof MethodArgumentConversionNotSupportedException) { - methodParameter = ((MethodArgumentConversionNotSupportedException) e).getParameter(); - } else if (e instanceof MethodArgumentTypeMismatchException) { - methodParameter = ((MethodArgumentTypeMismatchException) e).getParameter(); - } - - BaseException ex = null; - if (methodParameter != null) { - TypeMismatch typeMismatch = methodParameter.getMethod() - .getParameters()[methodParameter.getParameterIndex()].getAnnotation(TypeMismatch.class); - if (typeMismatch != null) { - ex = new InputErrorException(typeMismatch.message()); - } - } - - if (ex == null) { - ex = new InputErrorException(); - } - - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - /** - * 处理由于传入参数类型不匹配导致的异常 - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(HttpMessageNotReadableException.class) - public Response invalidFormatException(HttpMessageNotReadableException e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new InputErrorException(); - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - /** - * 处理由于传入方式错误导致的异常 - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(HttpRequestMethodNotSupportedException.class) - public Response httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e, - HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new DefaultSysException(); - - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(); - } - - @ExceptionHandler(FileUploadException.class) - public Response fileUploadExceptionHandler(FileUploadException e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new DefaultClientException("文件上传失败！"); - - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - /** - * 处理Exception - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(Exception.class) - public Response exceptionHandler(Exception e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new DefaultSysException(); - - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - /** - * 处理Throwable - * - * @param e - * @param method - * @return - */ - @ExceptionHandler(Throwable.class) - public Response throwableHandle(Throwable e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new InputErrorException(); - - this.setResponseCode(ex); - - return getBuilder(method.getBean()).fail(ex); - } - - /** - * 处理无权限异常 - * - * @param e - * @return - */ - @ExceptionHandler(AccessDeniedException.class) - public Response handle(AccessDeniedException e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new AccessDeniedException(); - this.setResponseCode(ex); - - return this.getBuilder(method.getBean()).fail(ex); - } - - @ExceptionHandler(NotPermissionException.class) - public Response notPermissionException(NotPermissionException e, HandlerMethod method) { - - this.logException(e, method); - - BaseException ex = new AccessDeniedException(); - - this.setResponseCode(ex); - - return this.getBuilder(method.getBean()).fail(ex); - } - - protected void logException(Throwable e, HandlerMethod method) { - - if (e instanceof ClientException) { - if (log.isDebugEnabled()) { - String className = method.getBeanType().getName(); - String methodName = method.getMethod().getName(); - log.debug("className={}, methodName={}, 有异常产生", className, methodName, e); - } - } else { - String className = method.getBeanType().getName(); - String methodName = method.getMethod().getName(); - log.error("className={}, methodName={}, 有异常产生", className, methodName, e); - } - } - - protected void setResponseCode(BaseException e) { - - ResponseUtil.getResponse().setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); - } - - protected ResponseErrorBuilder getBuilder(Object bean) { - - Map builders = ApplicationUtil.getBeansOfType( - ResponseErrorBuilder.class); - ResponseErrorBuilder builder = null; - for (ResponseErrorBuilder value : builders.values()) { - if (value.isDefault()) { - builder = value; - break; - } - } - - for (ResponseErrorBuilder value : builders.values()) { - if (value.isMatch(bean)) { - builder = value; - break; - } - } - - return builder; - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/export/ExportTaskWorker.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/export/ExportTaskWorker.java deleted file mode 100644 index 11eeaa9646f6fe2ca675d346bf6d77ae2ade3a40..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/export/ExportTaskWorker.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.lframework.xingyun.core.components.export; - -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.resp.PageResult; - -public interface ExportTaskWorker { - - /** - * 解析传入参数 - * - * @param json - * @return - */ - P parseParams(String json); - - /** - * 查询数据 - * - * @param pageIndex - * @param pageSize - * @param params - * @return - */ - PageResult getDataList(int pageIndex, int pageSize, P params); - - /** - * 导出数据 - * - * @param data - */ - M exportData(D data); - - /** - * 处理异常 - * - * @param e - */ - default void handleError(Exception e) { - } - - /** - * 获取导出模型类 - * - * @return - */ - Class getModelClass(); -} 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 deleted file mode 100644 index 9585d4df475bcf136056c32143e9cae3d3a5aa7a..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRule.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index cca7648545e927fc6104636187ea087aba421f16..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleEmail.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index fe845dfa799a30c85a58face02000c41394bb5ae..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleSys.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index c3b15d07a313d89e5516951923a8f4af7e9303fb..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/DataPermissionHandlerImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.lframework.xingyun.core.components.permission; - -import cn.dev33.satoken.exception.SaTokenException; -import cn.dev33.satoken.session.SaSession; -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.AbstractUserDetails; -import com.lframework.starter.web.components.security.SecurityConstants; -import com.lframework.starter.web.components.security.SecurityUtil; -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 { - AbstractUserDetails currenUser = SecurityUtil.getCurrentUser(); - if (currenUser == null) { - return EMPTY_SQL; - } - - SaSession session = SecurityUtil.getSessionByLoginId(currenUser.getLoginId()); - 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-core/src/main/java/com/lframework/xingyun/core/components/permission/SysDataPermissionDataPermissionType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/SysDataPermissionDataPermissionType.java deleted file mode 100644 index eef0a9e5074b80b64fbaa5a129e4f8e0803624a6..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/SysDataPermissionDataPermissionType.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.core.components.permission; - -public enum SysDataPermissionDataPermissionType { - - PRODUCT(1, "商品"), ORDER(2, "单据"); - - private Integer code; - - private String desc; - - SysDataPermissionDataPermissionType(Integer code, String desc) { - this.code = code; - this.desc = desc; - } - - public Integer getCode() { - return this.code; - } - - public String getDesc() { - return desc; - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzHandler.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzHandler.java deleted file mode 100644 index db5483af48a53056116ac6c91f90d0d0bd57a27f..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzHandler.java +++ /dev/null @@ -1,321 +0,0 @@ -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.utils.ApplicationUtil; -import java.util.Map; -import lombok.extern.slf4j.Slf4j; -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.Trigger; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -import org.springframework.scheduling.quartz.SchedulerFactoryBean; - -@Slf4j -public class QrtzHandler { - - private static final SchedulerFactoryBean SCHEDULER_FACTORY = ApplicationUtil.getBean( - SchedulerFactoryBean.class); - - public static void addJob(Class jobClass, String cron, - Map jobDatas) { - - addJob(null, null, jobClass, null, null, cron, jobDatas); - } - - public static void addJob(Class jobClass, String cron) { - - addJob(null, null, jobClass, null, null, cron, null); - } - - public static void addJob(String jobName, String jobGroupName, Class jobClass, - String triggerName, String triggerGroupName, String cron) { - - addJob(jobName, jobGroupName, jobClass, triggerName, triggerGroupName, cron, null); - } - - public static void addJob(String jobName, String jobGroupName, Class jobClass, - String triggerName, String triggerGroupName, String cron, Map jobDatas) { - - addJob(jobName, jobGroupName, jobClass, triggerName, triggerGroupName, cron, jobDatas, null); - } - - /** - * 添加任务 - * - * @param jobName 任务名 - * @param jobGroupName 任务组名 - * @param jobClass 任务类Class - * @param triggerName 触发器名 - * @param triggerGroupName 触发器组名 - * @param cron cron表达式 - * @param jobDatas 附加数据 - */ - public static void addJob(String jobName, String jobGroupName, Class jobClass, - String triggerName, String triggerGroupName, String cron, Map jobDatas, - String description) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - JobBuilder jobBuilder = JobBuilder.newJob(jobClass); - if (!StringUtil.isBlank(jobName)) { - jobBuilder.withIdentity(jobName, jobGroupName); - } - - JobDetail jobDetail = jobBuilder.withDescription( - StringUtil.isBlank(description) ? StringPool.EMPTY_STR : description).build(); - if (!CollectionUtil.isEmpty(jobDatas)) { - jobDatas.forEach((k, v) -> jobDetail.getJobDataMap().put(k, v)); - } - - TriggerBuilder triggerBuilder = TriggerBuilder.newTrigger(); - if (!StringUtil.isBlank(triggerName)) { - triggerBuilder.withIdentity(triggerName, triggerGroupName); - } - - triggerBuilder.startNow(); - triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron)); - CronTrigger trigger = (CronTrigger) triggerBuilder.build(); - sched.scheduleJob(jobDetail, trigger); - - if (!sched.isShutdown()) { - sched.start(); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 查询触发器 - * - * @param triggerName 触发器名称 - * @param triggerGroupName 触发器组名称 - * @return - */ - public static CronTrigger getTrigger(String triggerName, String triggerGroupName) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, triggerGroupName); - CronTrigger trigger = (CronTrigger) sched.getTrigger(triggerKey); - - return trigger; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 查询任务 - * - * @param jobName - * @param jobGroupName - * @return - */ - public static JobDetail getJob(String jobName, String jobGroupName) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - JobDetail jobDetail = sched.getJobDetail(JobKey.jobKey(jobName, jobGroupName)); - return jobDetail; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 修改任务Cron - * - * @param triggerName 触发器名称 - * @param triggerGroupName 触发器组名称 - * @param cron cron表达式 - */ - public static void updateJobCron(String triggerName, String triggerGroupName, String cron) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - CronTrigger trigger = getTrigger(triggerName, triggerGroupName); - if (trigger == null) { - return; - } - - String oriCron = trigger.getCronExpression(); - if (!oriCron.equalsIgnoreCase(cron)) { - TriggerBuilder triggerBuilder = TriggerBuilder.newTrigger(); - triggerBuilder.withIdentity(triggerName, triggerGroupName); - triggerBuilder.startNow(); - triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron)); - trigger = (CronTrigger) triggerBuilder.build(); - sched.rescheduleJob(TriggerKey.triggerKey(triggerName, triggerGroupName), trigger); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 删除任务 - * - * @param jobName 任务名称 - * @param jobGroupName 任务组名称 - * @param triggerName 触发器名称 - * @param triggerGroupName 触发器组名称 - */ - public static void deleteJob(String jobName, String jobGroupName, String triggerName, - String triggerGroupName) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, triggerGroupName); - - sched.pauseTrigger(triggerKey); - sched.unscheduleJob(triggerKey); - sched.deleteJob(JobKey.jobKey(jobName, jobGroupName)); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 启动所有任务 - */ - public static void startJobs() { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - sched.start(); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 关闭所有任务 - */ - public static void shutdownJobs() { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - if (!sched.isShutdown()) { - sched.shutdown(); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 安全关闭 - * - * @throws SchedulerException - */ - public static void safeShutdown() throws SchedulerException { - - try { - DynamicDataSourceContextHolder.push("master"); - int executingJobSize = SCHEDULER_FACTORY.getScheduler().getCurrentlyExecutingJobs().size(); - log.info("当前运行任务个数：{}，等待完成后关闭", executingJobSize); - SCHEDULER_FACTORY.getScheduler().shutdown(true); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 恢复任务 - * - * @param jobName - * @param jobGroupName - */ - public static void resume(String jobName, String jobGroupName) { - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - sched.resumeJob(JobKey.jobKey(jobName, jobGroupName)); - } catch (SchedulerException e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 暂停任务 - * - * @param jobName - * @param jobGroupName - */ - public static void pause(String jobName, String jobGroupName) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - sched.pauseJob(JobKey.jobKey(jobName, jobGroupName)); - } catch (SchedulerException e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } - - /** - * 触发任务 - * - * @param jobName - * @param jobGroupName - */ - public static void trigger(String jobName, String jobGroupName) { - - try { - DynamicDataSourceContextHolder.push("master"); - Scheduler sched = SCHEDULER_FACTORY.getScheduler(); - sched.triggerJob(JobKey.jobKey(jobName, jobGroupName)); - } catch (SchedulerException e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } finally { - DynamicDataSourceContextHolder.poll(); - } - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzJob.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzJob.java deleted file mode 100644 index 5e6683839e14fe1779bbe6ad40ec02d2f7530e1f..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzJob.java +++ /dev/null @@ -1,52 +0,0 @@ -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.components.tenant.TenantContextHolder; -import java.io.Serializable; -import lombok.extern.slf4j.Slf4j; -import org.quartz.DisallowConcurrentExecution; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -/** - * 定时任务 - */ -@Slf4j -@DisallowConcurrentExecution -public abstract class QrtzJob implements Job, Serializable { - - private static final long serialVersionUID = 1L; - - @Override - public void execute(JobExecutionContext context) throws JobExecutionException { - - log.info("开始执行定时任务【{}】", this.getClass().getName()); - long begTime = System.currentTimeMillis(); - - try { - // 这里获取tenantId 如果为空则不设置租户ID - Integer tenantId = (Integer) context.getJobDetail().getJobDataMap().get(StringPool.TENANT_ID_QRTZ); - if (tenantId != null) { - TenantContextHolder.setTenantId(tenantId); - } - this.onExecute(context); - long endTime = System.currentTimeMillis(); - log.info("定时任务【{}】执行完毕，共耗时{}ms", this.getClass().getName(), endTime - begTime); - } catch (Exception e) { - if (e instanceof ClientException) { - log.warn("执行定时任务【{}】失败", this.getClass().getName()); - log.warn(e.getMessage(), e); - } else { - log.error("执行定时任务【{}】失败", this.getClass().getName()); - log.error(e.getMessage(), e); - } - throw new JobExecutionException(e); - } finally { - TenantContextHolder.clearTenantId(); - } - } - - protected abstract void onExecute(JobExecutionContext context) throws Exception; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/timeline/ReceiveOrderTimeLineBizType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/timeline/ReceiveOrderTimeLineBizType.java new file mode 100644 index 0000000000000000000000000000000000000000..f9fa899e6903bf330f67db49019b5b11172df987 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/timeline/ReceiveOrderTimeLineBizType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.core.components.timeline; + +import com.lframework.starter.web.core.components.timeline.OrderTimeLineBizType; +import org.springframework.stereotype.Component; + +@Component +public class ReceiveOrderTimeLineBizType implements OrderTimeLineBizType { + + @Override + public Integer getCode() { + return 7; + } +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/config/MpInterceptorConfiguration.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/config/MpInterceptorConfiguration.java deleted file mode 100644 index 389abdfbc8878662cd3ed4bc7387443b575502f8..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/config/MpInterceptorConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -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.core.components.permission.DataPermissionHandlerImpl; -import com.lframework.xingyun.core.interceptors.CustomSortInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class MpInterceptorConfiguration { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor( - new DataPermissionInterceptor(new DataPermissionHandlerImpl())); - interceptor.addInnerInterceptor(new CustomSortInterceptor()); - interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor()); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); - return interceptor; - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/GenerateCodeDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/GenerateCodeDto.java deleted file mode 100644 index 647cb1516d238c509daee23ca839011bd05d3782..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/GenerateCodeDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.core.dto; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenerateCodeDto implements BaseDto, Serializable { - - public static final String CACHE_NAME = "GenerateCodeDto"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private Integer id; - - /** - * 规则配置 - */ - private String configStr; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/dic/city/DicCityDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/dic/city/DicCityDto.java deleted file mode 100644 index 8be955efe8c2ecb4a7841e20fa1c4ec90b5a9b90..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/dic/city/DicCityDto.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.core.dto.dic.city; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class DicCityDto implements BaseDto, Serializable { - - public static final String CACHE_NAME = "DicCityDto"; - - public static final String SELECTOR_CACHE_NAME = "DicCitySelectorDto"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 父级ID - */ - private String parentId; - - /** - * 层级 - */ - private Integer level; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/export/AddExportTaskDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/export/AddExportTaskDto.java deleted file mode 100644 index 3a3771f8c627a888428bf34dd54575c26209ab20..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/export/AddExportTaskDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.core.dto.export; - -import java.io.Serializable; -import lombok.Data; - -@Data -public class AddExportTaskDto implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - private String name; - - /** - * 请求类名 - */ - private String reqClassName; - - /** - * 请求类方法参数 - */ - private String reqParams; - - /** - * 用户Token - */ - private String token; -} 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 deleted file mode 100644 index 00924711d1ba783a86e285f26a3e2a445e52f429..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysMailMessageDto.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 6164de3f78c90f68d2328862825578b034198845..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysSiteMessageDto.java +++ /dev/null @@ -1,35 +0,0 @@ -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-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyDto.java deleted file mode 100644 index 94e14a4f924d8dc93a422e47fea166b15e2daa9e..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyDto.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.core.dto.notify; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SysNotifyDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 动态参数 - */ - private Object variables; - - /** - * 业务类型 - */ - private Integer bizType; - - /** - * 通知组ID - */ - 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 deleted file mode 100644 index 03c10ebf1223ec4be0ff7ea1209ba8e11b6938db..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyParamsDto.java +++ /dev/null @@ -1,16 +0,0 @@ -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/dto/order/ApprovePassOrderDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/order/ApprovePassOrderDto.java deleted file mode 100644 index 72d4f2541e02b9c123825269071cea41027ed561..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/order/ApprovePassOrderDto.java +++ /dev/null @@ -1,37 +0,0 @@ -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.Data; - -@Data -public class ApprovePassOrderDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 业务单据ID - */ - private String id; - - /** - * 单据总金额 - */ - private BigDecimal totalAmount; - - /** - * 审核时间 - */ - private LocalDateTime approveTime = LocalDateTime.now(); - - /** - * 单据类型 - */ - private 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 deleted file mode 100644 index dde504ab75f1d53494eb0f5b7a3ddc4fa495d947..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/stock/ProductStockChangeDto.java +++ /dev/null @@ -1,49 +0,0 @@ -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; - -@Data -public class ProductStockChangeDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 仓库ID - */ - private String scId; - - /** - * 商品ID - */ - private String productId; - - /** - * 变动数量 - */ - private Integer num; - - /** - * 含税变动金额 - */ - private BigDecimal taxAmount; - - /** - * 当前含税均价 - */ - private BigDecimal curTaxPrice; - - /** - * 当前库存数量 - */ - private Integer curStockNum; - - /** - * 生成时间 - */ - private LocalDateTime createTime; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/DicCity.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/DicCity.java deleted file mode 100644 index b8bdc1e857b43cb657ccb3f7fe8c8e8047537faa..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/DicCity.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lframework.xingyun.core.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-07-07 - */ -@Data -@TableName("dic_city") -public class DicCity extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 父级ID - */ - private String parentId; - - /** - * 层级 - */ - private Integer level; - - /** - * 状态 - */ - private Boolean available; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OpLogs.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OpLogs.java deleted file mode 100644 index f4b701005d2d2f1d41f0d8238fd8d57bcfa67462..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OpLogs.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.lframework.xingyun.core.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 操作日志实体类 - *

- * - * @author zmj - */ -@Data -@TableName("op_logs") -public class OpLogs extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 日志名称 - */ - private String name; - - /** - * 类别 - */ - private Integer logType; - - /** - * IP地址 - */ - private String ip; - - /** - * 补充信息 - */ - private String extra; - - /** - * 创建人ID 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createById; - - /** - * 创建人 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 创建时间 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OrderTimeLine.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OrderTimeLine.java deleted file mode 100644 index 95af84a58f0a077c6f97fa69ec97bb7bb9c4fb44..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OrderTimeLine.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.lframework.xingyun.core.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.OrderTimeLineBizType; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-07-07 - */ -@Data -@TableName("tbl_order_time_line") -public class OrderTimeLine extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "OrderTimeLine"; - - /** - * ID - */ - private String id; - - /** - * 订单ID - */ - private String orderId; - - /** - * 描述内容 - */ - private String content; - - /** - * 创建人ID 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createById; - - /** - * 创建人 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; - - /** - * 业务类型 - */ - private OrderTimeLineBizType bizType; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/RecursionMapping.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/RecursionMapping.java deleted file mode 100644 index 1550cbe7075265c40983fa15c544b468beb91689..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/RecursionMapping.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.core.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * 递归映射 - *

- * - * @author zmj - * @since 2021-06-27 - */ -@Data -@TableName("recursion_mapping") -public class RecursionMapping extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - private String id; - - /** - * 节点ID - */ - private String nodeId; - - /** - * 节点类型 - */ - private Integer nodeType; - - /** - * 从顶点到当前结点的路径，用,分割 - */ - private String path; - - /** - * 节点层级 - */ - private Integer level; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/SecurityUploadRecord.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/SecurityUploadRecord.java deleted file mode 100644 index e1f964865f08513fb44cf8e7a7de0605ce7e24d2..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/SecurityUploadRecord.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lframework.xingyun.core.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.core.enums.UploadType; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 文件收纳箱 - *

- */ -@Data -@TableName("tbl_security_upload_record") -public class SecurityUploadRecord extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - /** - * ID - */ - private String id; - - /** - * 上传方式 - */ - private UploadType uploadType; - - /** - * 文件路径 - */ - private String filePath; - - /** - * 创建人ID 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createById; - - /** - * 创建人 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Available.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Available.java deleted file mode 100644 index 7ce1114b1cb874552b00538fbabc08ce89acc8f5..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Available.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.core.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum Available implements BaseEnum { - ENABLE(Boolean.TRUE, "启用"), UNABLE(Boolean.FALSE, "停用"); - - - @EnumValue - private final Boolean code; - - private final String desc; - - Available(Boolean code, String desc) { - - this.code = code; - this.desc = desc; - } - - @Override - public Boolean getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/DefaultOpLogType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/DefaultOpLogType.java deleted file mode 100644 index 00f33217f29cc0a755364383a2bc92f2aa484a70..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/DefaultOpLogType.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.core.enums; - -/** - * 默认操作日志类别 - * - * @author zmj - */ -public interface DefaultOpLogType { - - /** - * 用户认证 - */ - int AUTH = 1; - - /** - * 系统管理 - */ - int SYSTEM = 2; - - /** - * 其他 - */ - int OTHER = 99; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Gender.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Gender.java deleted file mode 100644 index 5fca18735c2404b66c4cbfbc4a240d7229b465cf..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Gender.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.core.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum Gender implements BaseEnum { - UNKNOWN(0, "未知"), MAN(1, "男"), FEMALE(2, "女"); - - @EnumValue - private final Integer code; - - private final String desc; - - Gender(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-core/src/main/java/com/lframework/xingyun/core/enums/NodeType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/NodeType.java deleted file mode 100644 index 509e5e08fec66e928ddd82a2d2c56fb9ad27c3f6..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/NodeType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.lframework.xingyun.core.enums; - -import com.lframework.starter.web.enums.BaseEnum; - -public interface NodeType extends BaseEnum { - -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/OrderTimeLineBizType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/OrderTimeLineBizType.java deleted file mode 100644 index 94362f93a686786743b2534ba84c0c54410adcfc..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/OrderTimeLineBizType.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.core.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -/** - * @author zmj - * @since 2022/8/10 - */ -public enum OrderTimeLineBizType implements BaseEnum { - NORMAL(0, "普通操作"), - CREATE(1, "保存"), - UPDATE(2, "修改"), - SEND(3, "发送"), - APPROVE_PASS(4, "审核通过"), - APPROVE_RETURN(5, "审核拒绝"), - CANCEL_APPROVE(6, "取消审核"), - RECEIVE(7, "收货") - ; - - @EnumValue - private final Integer code; - - private final String desc; - - OrderTimeLineBizType(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-core/src/main/java/com/lframework/xingyun/core/enums/UploadType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/UploadType.java deleted file mode 100644 index 620790b55ec4b3d20d8f4e6c2fae7d583b3dcde1..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/UploadType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.core.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum UploadType implements BaseEnum { - LOCAL("LOCAL", "本地"), - OSS("OSS", "阿里云OSS"), - COS("COS", "腾讯云COS"), - OBS("OBS", "华为云OBS"); - - @EnumValue - private final String code; - - private final String desc; - - UploadType(String code, String desc) { - this.code = code; - this.desc = desc; - } - - @Override - public String getCode() { - return this.code; - } - - @Override - public String getDesc() { - return this.desc; - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/DicCityServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/DicCityServiceImpl.java deleted file mode 100644 index ddc45e4bcb17a5f6bb70c9e04d9057ce04d99eec..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/DicCityServiceImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.core.impl; - -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.entity.DicCity; -import com.lframework.xingyun.core.mappers.DicCityMapper; -import com.lframework.xingyun.core.service.DicCityService; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -@Service -public class DicCityServiceImpl extends BaseMpServiceImpl implements - DicCityService { - - @Cacheable(value = DicCityDto.SELECTOR_CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List getAll() { - - return getBaseMapper().getAll(); - } - - @Cacheable(value = DicCityDto.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public DicCityDto findById(String id) { - - return getBaseMapper().findById(id); - } - - @Override - public List getChainById(String id) { - - DicCityService thisService = getThis(this.getClass()); - List all = thisService.getAll(); - List results = new ArrayList<>(); - DicCityDto current = all.stream().filter(t -> t.getId().equals(id)).findFirst().orElse(null); - if (current == null) { - return results; - } - - while (current != null) { - results.add(current); - - String pId = current.getParentId(); - current = all.stream().filter(t -> t.getId().equals(pId)).findFirst().orElse(null); - } - - Collections.reverse(results); - - return results; - } - - @CacheEvict(value = DicCityDto.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @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 deleted file mode 100644 index 7dd24ecef0b9908ea44cd3e6665520164e801bd3..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/GenerateCodeServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -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-core/src/main/java/com/lframework/xingyun/core/impl/OpLogsServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OpLogsServiceImpl.java deleted file mode 100644 index dd41bb94aa9f02917ebe110c377e8054175e2fa7..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OpLogsServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -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.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; -import com.lframework.starter.web.utils.IdUtil; -import java.time.LocalDateTime; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 操作日志Service实现 - * - * @author zmj - */ -@Slf4j -@Service -public class OpLogsServiceImpl extends BaseMpServiceImpl - implements OpLogsService { - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateOpLogsVo vo) { - - OpLogs record = this.doCreate(vo); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void create(Collection list) { - if (CollectionUtil.isEmpty(list)) { - return; - } - List records = list.stream().map(this::doCreate).collect(Collectors.toList()); - this.saveBatch(records); - } - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryOpLogsVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = this.doQuery(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public OpLogs findById(String id) { - - return this.doGetById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void clearLogs(LocalDateTime endTime) { - - log.info("开始清除创建时间早于{}的操作日志", endTime); - - this.doClearLogs(endTime); - } - - protected OpLogs doCreate(CreateOpLogsVo vo) { - - OpLogs record = new OpLogs(); - record.setId(IdUtil.getId()); - record.setName(vo.getName()); - record.setLogType(vo.getLogType()); - if (!StringUtil.isBlank(vo.getCreateBy())) { - record.setCreateBy(vo.getCreateBy()); - } - - if (!StringUtil.isBlank(vo.getCreateById())) { - record.setCreateById(vo.getCreateById()); - } - - if (!StringUtil.isBlank(vo.getExtra())) { - record.setExtra(vo.getExtra()); - } - record.setIp(vo.getIp()); - - return record; - } - - protected List doQuery(QueryOpLogsVo vo) { - - return getBaseMapper().query(vo); - } - - protected OpLogs doGetById(String id) { - - return getBaseMapper().findById(id); - } - - protected void doClearLogs(LocalDateTime endTime) { - - getBaseMapper().clearLogs(endTime); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OrderTimeLineServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OrderTimeLineServiceImpl.java deleted file mode 100644 index 02282abf0218f5b30fb162d3adfed78fe0fd9d57..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OrderTimeLineServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.core.impl; - -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.core.entity.OrderTimeLine; -import com.lframework.xingyun.core.mappers.OrderTimeLineMapper; -import com.lframework.xingyun.core.service.OrderTimeLineService; -import java.io.Serializable; -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; - -/** - * @author zmj - * @since 2022/8/10 - */ -@Service -public class OrderTimeLineServiceImpl extends BaseMpServiceImpl implements - OrderTimeLineService { - - @Cacheable(value = OrderTimeLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #orderId", unless = "#result == null") - @Override - public List getByOrder(String orderId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(OrderTimeLine.class).eq(OrderTimeLine::getOrderId, orderId).orderByAsc(OrderTimeLine::getCreateTime); - - return this.list(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByOrder(String orderId) { - Wrapper deleteWrapper = Wrappers.lambdaQuery(OrderTimeLine.class).eq(OrderTimeLine::getOrderId, orderId); - this.remove(deleteWrapper); - } - - @CacheEvict(value = OrderTimeLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - super.cleanCacheByKey(key); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/RecursionMappingServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/RecursionMappingServiceImpl.java deleted file mode 100644 index edf5c04c8010f19160c1095bdd64ea7ed156dee6..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/RecursionMappingServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.lframework.xingyun.core.impl; - -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.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.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; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class RecursionMappingServiceImpl extends - BaseMpServiceImpl - implements RecursionMappingService { - - @Override - public List getNodeParentIds(@NonNull String nodeId, @NonNull NodeType nodeType) { - - if (StringUtil.isEmpty(nodeId)) { - return CollectionUtil.emptyList(); - } - - Wrapper queryWrapper = Wrappers.lambdaQuery(RecursionMapping.class) - .eq(RecursionMapping::getNodeId, nodeId) - .eq(RecursionMapping::getNodeType, nodeType.getCode()); - - RecursionMapping recursionMappings = getBaseMapper().selectOne(queryWrapper); - if (recursionMappings == null || StringUtil.isEmpty(recursionMappings.getPath())) { - return CollectionUtil.emptyList(); - } - - return StringUtil.split(recursionMappings.getPath(), StringPool.STR_SPLIT); - } - - @Override - public List getNodeChildIds(String nodeId, NodeType nodeType) { - - return getBaseMapper().getNodeChildIds(nodeId, nodeType.getCode()); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void saveNode(String nodeId, NodeType nodeType) { - - this.saveNode(nodeId, nodeType, null); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteNode(String nodeId, NodeType nodeType) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery(RecursionMapping.class) - .eq(RecursionMapping::getNodeId, nodeId) - .eq(RecursionMapping::getNodeType, nodeType.getCode()); - getBaseMapper().delete(deleteWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteNodeAndChildren(String nodeId, NodeType nodeType) { - List childNodeIds = this.getNodeChildIds(nodeId, nodeType); - List allNodeIds = new ArrayList<>(); - allNodeIds.add(nodeId); - allNodeIds.addAll(childNodeIds); - Wrapper deleteWrapper = Wrappers.lambdaQuery(RecursionMapping.class) - .in(RecursionMapping::getNodeId, allNodeIds) - .eq(RecursionMapping::getNodeType, nodeType.getCode()); - getBaseMapper().delete(deleteWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void saveNode(@NonNull String nodeId, @NonNull NodeType nodeType, List parentIds) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery(RecursionMapping.class) - .eq(RecursionMapping::getNodeId, nodeId) - .eq(RecursionMapping::getNodeType, nodeType.getCode()); - getBaseMapper().delete(deleteWrapper); - - RecursionMapping data = new RecursionMapping(); - data.setId(IdUtil.getId()); - data.setNodeId(nodeId); - data.setNodeType(nodeType.getCode()); - data.setLevel(1); - data.setPath(StringPool.EMPTY_STR); - if (!CollectionUtil.isEmpty(parentIds)) { - data.setPath(StringUtil.join(StringPool.STR_SPLIT, parentIds)); - data.setLevel(parentIds.size() + 1); - } - - getBaseMapper().insert(data); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/SecurityUploadRecordServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/SecurityUploadRecordServiceImpl.java deleted file mode 100644 index 2510e8cbda5b0e46eb324363bb71b45e60a5616f..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/SecurityUploadRecordServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.core.impl; - -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.core.entity.SecurityUploadRecord; -import com.lframework.xingyun.core.enums.UploadType; -import com.lframework.xingyun.core.mappers.SecurityUploadRecordMapper; -import com.lframework.xingyun.core.service.SecurityUploadRecordService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SecurityUploadRecordServiceImpl extends - BaseMpServiceImpl implements - SecurityUploadRecordService { - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(String uploadType, String filePath) { - SecurityUploadRecord uploadRecord = new SecurityUploadRecord(); - uploadRecord.setId(IdUtil.getId()); - uploadRecord.setUploadType(EnumUtil.getByCode(UploadType.class, uploadType)); - uploadRecord.setFilePath(filePath); - - this.save(uploadRecord); - - return uploadRecord.getId(); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/interceptors/CustomSortInterceptor.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/interceptors/CustomSortInterceptor.java deleted file mode 100644 index 16144dabb644944c4b6cb411e54cc56be4d941cd..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/interceptors/CustomSortInterceptor.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.lframework.xingyun.core.interceptors; - -import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; -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.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; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; -import net.sf.jsqlparser.JSQLParserException; -import net.sf.jsqlparser.parser.CCJSqlParser; -import net.sf.jsqlparser.parser.CCJSqlParserUtil; -import net.sf.jsqlparser.parser.ParseException; -import net.sf.jsqlparser.statement.Statement; -import net.sf.jsqlparser.statement.select.PlainSelect; -import net.sf.jsqlparser.statement.select.Select; -import org.apache.ibatis.executor.Executor; -import org.apache.ibatis.mapping.BoundSql; -import org.apache.ibatis.mapping.MappedStatement; -import org.apache.ibatis.session.ResultHandler; -import org.apache.ibatis.session.RowBounds; - -@Slf4j -public class CustomSortInterceptor extends JsqlParserSupport implements InnerInterceptor { - - @Override - public void beforeQuery( - Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, - ResultHandler resultHandler, BoundSql boundSql) throws SQLException { - if (parameter instanceof Map) { - Map map = (Map) parameter; - List sortPageVos = map.values().stream() - .filter(t -> t instanceof SortPageVo).map(t -> (SortPageVo) t) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(sortPageVos)) { - return; - } - Map sortMap = this.convertSortMap(ms.getId()); - if (CollectionUtil.isEmpty(sortMap)) { - return; - } - - StringBuilder sqlBuilder = new StringBuilder("ORDER BY "); - - List orderBySqlElements = sortPageVos.stream() - .filter(t -> sortMap.containsKey(t.getSortField())).map( - t -> sortMap.get(t.getSortField()) + " " + ( - "asc".equalsIgnoreCase(t.getSortOrder()) ? "ASC" : "DESC")).distinct() - .collect( - Collectors.toList()); - - if (CollectionUtil.isEmpty(orderBySqlElements)) { - return; - } - - // order by code asc, name desc - String sqlProvider = sqlBuilder.append(StringUtil.join(",", orderBySqlElements)) - .toString(); - - CCJSqlParser parser = CCJSqlParserUtil.newParser(sqlProvider); - - PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql); - - String sql = mpBs.sql(); - try { - Statement statement = CCJSqlParserUtil.parse(sql); - PlainSelect plainSelect = (PlainSelect) ((Select) statement).getSelectBody(); - plainSelect.setOrderByElements(parser.OrderByElements()); - mpBs.sql(statement.toString()); - } catch (JSQLParserException | ParseException e) { - log.error("Failed to process, Error SQL: {}", sql); - log.error(e.getMessage(), e); - } - } - } - - private Map convertSortMap(String statementId) { - // 获取Mapper执行方法上的注解 - Method mapperMethod = null; - try { - mapperMethod = this.findMapperMethod(this.convertMsId(statementId)); - } catch (ClassNotFoundException e) { - return null; - } - if (mapperMethod == null) { - return null; - } - Sorts sorts = mapperMethod.getAnnotation(Sorts.class); - - if (sorts != null) { - Sort[] sortList = sorts.value(); - Map sortKeyMap = new HashMap<>(sortList.length); - for (Sort sort : sortList) { - if (sort.autoParse()) { - sortKeyMap.put(sort.value(), (StringUtil.isEmpty(sort.alias()) ? "" : (sort.alias() + ".")) + StringUtil.toUnderlineCase(sort.value())); - } else { - sortKeyMap.put(sort.value(), sort.alias()); - } - } - - return sortKeyMap; - } - - return null; - } - - private String convertMsId(String id) { - 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-core/src/main/java/com/lframework/xingyun/core/mappers/DicCityMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/DicCityMapper.java deleted file mode 100644 index 38b7909d16aabff5523f2d059ce8b2133ce63adb..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/DicCityMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.core.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.entity.DicCity; -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-07 - */ -public interface DicCityMapper extends BaseMapper { - - /** - * 查询所有数据 - * - * @return - */ - List getAll(); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - DicCityDto findById(String id); -} 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 deleted file mode 100644 index 06626783bfa06f6c3faa260e52f56b291481c3d6..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/GenerateCodeMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.core.mappers; - -import com.lframework.xingyun.core.dto.GenerateCodeDto; - -public interface GenerateCodeMapper { - - GenerateCodeDto findById(Integer id); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OpLogsMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OpLogsMapper.java deleted file mode 100644 index d0988b3d19d75639f1f50482fe84a71db4e332d0..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OpLogsMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.core.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -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; - -/** - *

- * 操作日志 Mapper - *

- * - * @author zmj - */ -public interface OpLogsMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryOpLogsVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - OpLogs findById(String id); - - /** - * 根据截止时间删除日志 - * - * @param endTime - */ - void clearLogs(@Param("endTime") LocalDateTime endTime); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OrderTimeLineMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OrderTimeLineMapper.java deleted file mode 100644 index 1097fd5b9a87e63f4ff6d48730add89599554b4f..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OrderTimeLineMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.lframework.xingyun.core.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.core.entity.OrderTimeLine; - -/** - * @author zmj - * @since 2022/8/10 - */ -public interface OrderTimeLineMapper extends BaseMapper { - -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/RecursionMappingMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/RecursionMappingMapper.java deleted file mode 100644 index 23f0f3e4b7c160bb053eb2158d1df97653917a2a..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/RecursionMappingMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.lframework.xingyun.core.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.core.entity.RecursionMapping; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 递归映射 Mapper 接口 - *

- * - * @author zmj - * @since 2021-06-27 - */ -public interface RecursionMappingMapper extends BaseMapper { - - List getNodeChildIds(@Param("nodeId") String nodeId, @Param("nodeType") Integer nodeType); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/SecurityUploadRecordMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/SecurityUploadRecordMapper.java deleted file mode 100644 index a170eef7aff567e5b885f6bb23b0df4f4d2d9d43..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/SecurityUploadRecordMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lframework.xingyun.core.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.core.entity.SecurityUploadRecord; - -/** - *

- * 安全上传记录 Mapper 接口 - *

- */ -public interface SecurityUploadRecordMapper extends BaseMapper { - -} 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 index 9f96b26bac50b1c713343d838233e95567fc4e19..84bbec9f91f43059f1f9632a48247370c5a4b48c 100644 --- 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 @@ -22,34 +22,4 @@ public class MqConstants { */ 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); - - /** - * 新增导出任务 - */ - public static final QueueDefinition ADD_EXPORT_TASK = new RabbitMQQueueDefinition( - MqStringPool.ADD_EXPORT_TASK_EXCHANGE, MqStringPool.ADD_EXPORT_TASK_ROUTING_KEY); - - /** - * 执行导出任务 - */ - public static final QueueDefinition EXECUTE_EXPORT_TASK = new RabbitMQQueueDefinition( - MqStringPool.EXECUTE_EXPORT_TASK_EXCHANGE, MqStringPool.EXECUTE_EXPORT_TASK_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 index 48dfd2674e4110ff480735abd063ecbc3840b366..ba6b1986fedd7cbd7601e4f4aaef3fbbf95829bf 100644 --- 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 @@ -10,30 +10,4 @@ public interface MqStringPool { // 审核通过订单 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"; - - // 新增导出任务 - String ADD_EXPORT_TASK_EXCHANGE = "add_export_task.direct"; - String ADD_EXPORT_TASK_ROUTING_KEY = "add_export_task_routing_key"; - String ADD_EXPORT_TASK_QUEUE = "add_export_task"; - - // 执行导出任务 - String EXECUTE_EXPORT_TASK_EXCHANGE = "execute_export_task.direct"; - String EXECUTE_EXPORT_TASK_ROUTING_KEY = "execute_export_task_routing_key"; - String EXECUTE_EXPORT_TASK_QUEUE = "execute_export_task"; - } diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/DicCityService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/DicCityService.java deleted file mode 100644 index 3f25d1f942daa4c9f026a3a616fabc9257595503..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/DicCityService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.core.service; - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.entity.DicCity; -import java.util.List; - -public interface DicCityService extends BaseMpService { - - /** - * 查询所有数据 - * - * @return - */ - List getAll(); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - DicCityDto findById(String id); - - /** - * 根据ID查询链路数据 - * - * @param id 末级ID - * @return 返回值顺序：省、市、区 - */ - List getChainById(String id); -} 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 deleted file mode 100644 index 39185d40b53396b4aa52d910d1125abc216d199e..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/GenerateCodeService.java +++ /dev/null @@ -1,30 +0,0 @@ -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-core/src/main/java/com/lframework/xingyun/core/service/OpLogsService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OpLogsService.java deleted file mode 100644 index 2dd4f9e5442a8f814e23d8fd2ddf6337fc3f1655..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OpLogsService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lframework.xingyun.core.service; - -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -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; - -/** - * 操作日志Service - * - * @author zmj - */ -public interface OpLogsService extends BaseMpService { - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateOpLogsVo vo); - - /** - * 创建 - * - * @param list - * @return - */ - void create(Collection list); - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QueryOpLogsVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - OpLogs findById(String id); - - /** - * 根据截止时间删除日志 - * - * @param endTime - */ - void clearLogs(LocalDateTime endTime); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OrderTimeLineService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OrderTimeLineService.java deleted file mode 100644 index d107805010c57c3db03d5d99365c47b79f43d728..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OrderTimeLineService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lframework.xingyun.core.service; - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.entity.OrderTimeLine; -import java.util.List; - -/** - * @author zmj - * @since 2022/8/10 - */ -public interface OrderTimeLineService extends BaseMpService { - - /** - * 根据订单查询 - * @param orderId - * @return - */ - List getByOrder(String orderId); - - /** - * 根据订单删除 - * @param orderId - */ - void deleteByOrder(String orderId); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/RecursionMappingService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/RecursionMappingService.java deleted file mode 100644 index ea0737296f862b9bd443bb34d1d321e983dc38cb..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/RecursionMappingService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.core.service; - - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.entity.RecursionMapping; -import com.lframework.xingyun.core.enums.NodeType; -import java.util.List; - -public interface RecursionMappingService extends BaseMpService { - - /** - * 查询节点的父节点ID - * - * @param nodeId - * @param nodeType - * @return - */ - List getNodeParentIds(String nodeId, NodeType nodeType); - - /** - * 查询节点的子节点ID - * - * @param nodeId - * @param nodeType - * @return - */ - List getNodeChildIds(String nodeId, NodeType nodeType); - - - /** - * 保存节点递归信息 - * - * @param nodeId - * @param nodeType - * @param parentIds 顺序有意义，需要从顶点到终点的顺序排列 - */ - void saveNode(String nodeId, NodeType nodeType, List parentIds); - - /** - * 保存节点递归信息 - * - * @param nodeId - * @param nodeType - */ - void saveNode(String nodeId, NodeType nodeType); - - /** - * 根据节点ID删除 - * - * @param nodeId - * @param nodeType - */ - void deleteNode(String nodeId, NodeType nodeType); - - /** - * 根据节点ID删除以及子节点 - * - * @param nodeId - * @param nodeType - */ - void deleteNodeAndChildren(String nodeId, NodeType nodeType); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/SecurityUploadRecordService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/SecurityUploadRecordService.java deleted file mode 100644 index 25918e74d2941c42e5297f318255cda04f03f088..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/SecurityUploadRecordService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.lframework.xingyun.core.service; - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.entity.SecurityUploadRecord; - -/** - * 安全上传记录 Service - */ -public interface SecurityUploadRecordService extends BaseMpService { - - /** - * 新增 - * - * @param uploadType - * @param filePath - * @return - */ - String create(String uploadType, String filePath); -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/ExportTaskUtil.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/ExportTaskUtil.java deleted file mode 100644 index 5cf7754e1c2974093acbdcf17540675a5fad7439..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/ExportTaskUtil.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lframework.xingyun.core.utils; - -import com.lframework.starter.common.utils.DateUtil; -import com.lframework.starter.mq.core.producer.MqProducer; -import com.lframework.starter.web.components.security.IUserTokenResolver; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; -import com.lframework.xingyun.core.dto.export.AddExportTaskDto; -import com.lframework.xingyun.core.queue.MqConstants; -import java.time.LocalDateTime; - -public class ExportTaskUtil { - - public static void exportTask(String taskName, - Class> clazz, - Object params) { - MqProducer mqProducer = ApplicationUtil.getBean(MqProducer.class); - IUserTokenResolver userTokenResolver = ApplicationUtil.getBean(IUserTokenResolver.class); - AddExportTaskDto dto = new AddExportTaskDto(); - dto.setName(taskName + "_" + DateUtil.formatDateTime(LocalDateTime.now(), "yyyyMMddHHmmss")); - dto.setReqClassName(clazz.getName()); - dto.setReqParams(JsonUtil.toJsonString(params)); - dto.setToken(userTokenResolver.getToken()); - - mqProducer.sendMessage(MqConstants.ADD_EXPORT_TASK, dto); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/OpLogUtil.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/OpLogUtil.java deleted file mode 100644 index e9b869baa20773a3513b34c0dba9cb027ee45536..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/OpLogUtil.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.lframework.xingyun.core.utils; - -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; - -/** - * 操作日志Util - * - * @author zmj - */ -@Slf4j -public class OpLogUtil { - - private static final ThreadLocal>> VARIABLE_POOL = new InheritableThreadLocal<>(); - - private static final ThreadLocal> LOG_ID_POOL = new InheritableThreadLocal<>(); - - 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) { - - initPool(); - - LOG_ID_POOL.get().add(logId); - - VARIABLE_POOL.get().putIfAbsent(logId, new HashMap<>()); - } - - public static void addLogs(Collection list) { - - try { - OP_LOG_POOL.get().addAll(list); - } catch (Exception e) { - // 这里异常不抛出 - log.error(e.getMessage(), e); - } - } - - public static void setVariable(String key, Object value) { - - VARIABLE_POOL.get().get(getCurrentLogId()).put(key, value); - } - - public static Map getVariables() { - - return VARIABLE_POOL.get().get(getCurrentLogId()); - } - - public static String getExtra() { - - Object value = EXTRA_POOL.get().get(getCurrentLogId()); - - return value == null ? null : JsonUtil.toJsonString(value); - } - - public static void setExtra(Object value) { - - 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() { - - if (VARIABLE_POOL.get() == null) { - VARIABLE_POOL.set(new HashMap<>()); - } - - if (LOG_ID_POOL.get() == null) { - LOG_ID_POOL.set(new ArrayList<>()); - } - - 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() { - - return LOG_ID_POOL.get().get(LOG_ID_POOL.get().size() - 1); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/CreateOpLogsVo.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/CreateOpLogsVo.java deleted file mode 100644 index 296a15fb2b286e9c652099aec8089655b02bf06a..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/CreateOpLogsVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lframework.xingyun.core.vo; - -import com.lframework.starter.web.vo.BaseVo; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -/** - * 新增操作日志Vo - * - * @author zmj - */ -@Data -public class CreateOpLogsVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 日志名称 - */ - @NotBlank(message = "日志名称不能为空！") - private String name; - - /** - * 类型 - */ - @NotNull(message = "日志类型不能为空！") - private Integer logType; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建人ID - */ - private String createById; - - /** - * IP地址 - */ - @NotBlank(message = "IP地址不能为空！") - private String ip; - - /** - * 补充信息 - */ - private String extra; -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/QueryOpLogsVo.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/QueryOpLogsVo.java deleted file mode 100644 index dfc563c84885e7c6041a177b48ca51c6bd461aae..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/QueryOpLogsVo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.lframework.xingyun.core.vo; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -/** - * 查询操作日志Vo - * - * @author zmj - */ -@Data -public class QueryOpLogsVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 日志名称 - */ - @ApiModelProperty("日志名称") - private String name; - - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; - - /** - * 日志类别 - */ - @ApiModelProperty("日志类别") - private Integer logType; - - /** - * 创建起始时间 - */ - @ApiModelProperty("创建起始时间") - private LocalDateTime startTime; - - /** - * 创建截止时间 - */ - @ApiModelProperty("创建截止时间") - private LocalDateTime endTime; -} diff --git a/xingyun-core/src/main/resources/mappers/DicCityMapper.xml b/xingyun-core/src/main/resources/mappers/DicCityMapper.xml deleted file mode 100644 index 5cadf0b35ea48403f1515b53d793385f1e24d627..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/resources/mappers/DicCityMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - SELECT id, - code, - name, - parent_id, - level - FROM dic_city - - - - - - diff --git a/xingyun-core/src/main/resources/mappers/GenerateCodeMapper.xml b/xingyun-core/src/main/resources/mappers/GenerateCodeMapper.xml deleted file mode 100644 index 5871e939040ebb8f6126ca6117d1ae2aac07d11b..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/resources/mappers/GenerateCodeMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/xingyun-core/src/main/resources/mappers/OpLogsMapper.xml b/xingyun-core/src/main/resources/mappers/OpLogsMapper.xml deleted file mode 100644 index 23195661bd1471f6f641d6748fd7c7788e4a07bd..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/resources/mappers/OpLogsMapper.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - SELECT - * - FROM op_logs - - - DELETE FROM op_logs - WHERE - - - - - - - diff --git a/xingyun-core/src/main/resources/mappers/RecursionMappingMappre.xml b/xingyun-core/src/main/resources/mappers/RecursionMappingMappre.xml deleted file mode 100644 index b1ebb1b61bf4230c57458fced19058e855b91f56..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/resources/mappers/RecursionMappingMappre.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/xingyun-export/pom.xml b/xingyun-export/pom.xml deleted file mode 100644 index 09a1a662576efb31bd03b997e46d45a7f1046fe9..0000000000000000000000000000000000000000 --- a/xingyun-export/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - com.lframework - xingyun - 1.0.0-SNAPSHOT - - - xingyun-export - 【${project.artifactId}】导出服务层 - - - - com.lframework - xingyun-core - - - - com.lframework - xingyun-basedata - - - - com.lframework - xingyun-sc - - - - com.lframework - xingyun-settle - - - - \ No newline at end of file diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/ExportingExportTaskBo.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/ExportingExportTaskBo.java deleted file mode 100644 index c14be5746ee7d4210ce0467ba0097a5b544236a1..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/ExportingExportTaskBo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lframework.xingyun.export.bo; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.export.entity.ExportTask; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class ExportingExportTaskBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 总数据条数 - */ - @ApiModelProperty("总数据条数") - private Long totalCount; - - /** - * 当前完成数据条数 - */ - @ApiModelProperty("当前完成数据条数") - private Long curCount; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - public ExportingExportTaskBo(ExportTask dto) { - super(dto); - } - - @Override - public BaseBo convert(ExportTask dto) { - return super.convert(dto, ExportingExportTaskBo::getStatus); - } - - @Override - protected void afterInit(ExportTask dto) { - this.status = dto.getStatus().getCode(); - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/FailExportTaskBo.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/FailExportTaskBo.java deleted file mode 100644 index 4601e93e0bb752bf6eefaf5c0ef53948a969c790..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/FailExportTaskBo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lframework.xingyun.export.bo; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.export.entity.ExportTask; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class FailExportTaskBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - /** - * 错误信息 - */ - @ApiModelProperty("错误信息") - private String errorMsg; - - public FailExportTaskBo(ExportTask dto) { - super(dto); - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/SuccessExportTaskBo.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/SuccessExportTaskBo.java deleted file mode 100644 index 15cbded97c442d350b5a3baa7262e17e93738c0d..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/bo/SuccessExportTaskBo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lframework.xingyun.export.bo; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.export.entity.ExportTask; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class SuccessExportTaskBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 文件大小 - */ - @ApiModelProperty("文件大小") - private String fileSize; - - /** - * 上传记录ID - */ - @ApiModelProperty("上传记录ID") - private String recordId; - - /** - * 总数据条数 - */ - @ApiModelProperty("总数据条数") - private Long totalCount; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - /** - * 完成时间 - */ - @ApiModelProperty("完成时间") - private LocalDateTime finishTime; - - public SuccessExportTaskBo(ExportTask dto) { - super(dto); - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/controller/ExportTaskController.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/controller/ExportTaskController.java deleted file mode 100644 index 7f1507bd13211ba91b893129a6139ffb7a41a9aa..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/controller/ExportTaskController.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.lframework.xingyun.export.controller; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.lframework.starter.common.utils.StringUtil; -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.export.bo.ExportingExportTaskBo; -import com.lframework.xingyun.export.bo.FailExportTaskBo; -import com.lframework.xingyun.export.bo.SuccessExportTaskBo; -import com.lframework.xingyun.export.entity.ExportTask; -import com.lframework.xingyun.export.enums.ExportTaskStatus; -import com.lframework.xingyun.export.service.ExportTaskService; -import com.lframework.xingyun.export.vo.QueryFailExportTaskVo; -import com.lframework.xingyun.export.vo.QuerySuccessExportTaskVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Valid; -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; - -/** - * 导出任务 - * - * @author zmj - */ -@Api(tags = "导出任务") -@Validated -@RestController -@RequestMapping("/export/task") -public class ExportTaskController extends DefaultBaseController { - - @Autowired - private ExportTaskService exportTaskService; - - /** - * 正在导出列表 - */ - @ApiOperation("正在导出列表") - @GetMapping("/exporting") - public InvokeResult> queryExporting() { - - Wrapper queryWrapper = Wrappers.lambdaQuery(ExportTask.class) - .eq(ExportTask::getCreateById, SecurityUtil.getCurrentUser().getId()) - .in(ExportTask::getStatus, ExportTaskStatus.CREATED, ExportTaskStatus.EXPORTING) - .orderByDesc(ExportTask::getCreateTime); - List datas = exportTaskService.list(queryWrapper); - - List results = datas.stream().map(ExportingExportTaskBo::new) - .collect(Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("导出成功列表") - @GetMapping("/success") - public InvokeResult> querySuccess( - @Valid QuerySuccessExportTaskVo vo) { - Wrapper queryWrapper = Wrappers.lambdaQuery(ExportTask.class) - .eq(ExportTask::getCreateById, SecurityUtil.getCurrentUser().getId()) - .eq(ExportTask::getStatus, ExportTaskStatus.SUCCESS) - .like(StringUtil.isNotBlank(vo.getName()), ExportTask::getName, vo.getName()) - .orderByDesc(ExportTask::getCreateTime); - - Page page = new Page<>(getPageIndex(vo), getPageSize(vo)); - - Page pageList = exportTaskService.page(page, queryWrapper); - PageResult pageResult = PageResultUtil.convert(pageList); - List datas = pageResult.getDatas(); - List results = datas.stream().map(SuccessExportTaskBo::new) - .collect(Collectors.toList()); - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - @ApiOperation("导出失败列表") - @GetMapping("/fail") - public InvokeResult> queryFail( - @Valid QueryFailExportTaskVo vo) { - Wrapper queryWrapper = Wrappers.lambdaQuery(ExportTask.class) - .eq(ExportTask::getCreateById, SecurityUtil.getCurrentUser().getId()) - .eq(ExportTask::getStatus, ExportTaskStatus.FAIL) - .like(StringUtil.isNotBlank(vo.getName()), ExportTask::getName, vo.getName()) - .orderByDesc(ExportTask::getCreateTime); - - Page page = new Page<>(getPageIndex(vo), getPageSize(vo)); - - Page pageList = exportTaskService.page(page, queryWrapper); - PageResult pageResult = PageResultUtil.convert(pageList); - List datas = pageResult.getDatas(); - List results = datas.stream().map(FailExportTaskBo::new) - .collect(Collectors.toList()); - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/dto/ExecuteExportTaskDto.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/dto/ExecuteExportTaskDto.java deleted file mode 100644 index 52ca59f437c72693401dfd9d6f1713fbc9e31c95..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/dto/ExecuteExportTaskDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.export.dto; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class ExecuteExportTaskDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - private String taskId; - - private String token; -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/dto/ExportTaskSummaryDto.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/dto/ExportTaskSummaryDto.java deleted file mode 100644 index a6dddcf6554637055754a83f9b08fbc1f5f1b587..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/dto/ExportTaskSummaryDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.export.dto; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class ExportTaskSummaryDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - private Integer unFinishedCount; - - private Integer successCount; - - private Integer failCount; -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/entity/ExportTask.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/entity/ExportTask.java deleted file mode 100644 index d9e4079ba0a7902f008320a47740fad025b71c76..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/entity/ExportTask.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.lframework.xingyun.export.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.export.enums.ExportTaskStatus; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 导出任务 - *

- * - * @author zmj - * @since 2025-04-10 - */ -@Data -@TableName("tbl_export_task") -public class ExportTask extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "ExportTask"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 上传记录ID - */ - private String recordId; - - /** - * 状态 - */ - private ExportTaskStatus status; - - /** - * 错误信息 - */ - private String errorMsg; - - /** - * 请求类名 - */ - private String reqClassName; - - - /** - * 请求类方法参数 - */ - private String reqParams; - - /** - * 请求类方法参数签名 - */ - private String reqParamsSign; - - /** - * 总数据条数 - */ - private Long totalCount; - - /** - * 当前完成数据条数 - */ - private Long curCount; - - /** - * 文件大小 - */ - private String fileSize; - - /** - * 创建人ID 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createById; - - /** - * 创建人 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 创建时间 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; - - /** - * 结束时间 - */ - private LocalDateTime finishTime; -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/enums/ExportTaskStatus.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/enums/ExportTaskStatus.java deleted file mode 100644 index 19f22903bd5ab8d87a33836db2a8bf137f0c831e..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/enums/ExportTaskStatus.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.export.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum ExportTaskStatus implements BaseEnum { - CREATED(0, "等待导出"), - EXPORTING(1, "正在导出"), - SUCCESS(2, "导出成功"), - FAIL(3, "导出失败"); - - @EnumValue - private final Integer code; - - private final String desc; - - ExportTaskStatus(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-export/src/main/java/com/lframework/xingyun/export/events/ExportTaskNotifyEvent.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/events/ExportTaskNotifyEvent.java deleted file mode 100644 index e5303cee9001a84ffe0e50b00748af57f67a63f5..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/events/ExportTaskNotifyEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.export.events; - -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -public class ExportTaskNotifyEvent extends ApplicationEvent { - - @Getter - private String createById; - - public ExportTaskNotifyEvent(Object source, String createById) { - super(source); - this.createById = createById; - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/handlers/ExportTaskHandler.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/handlers/ExportTaskHandler.java deleted file mode 100644 index d2484ca2e70b15f3515f91bacefaf3037e3b3a8e..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/handlers/ExportTaskHandler.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.lframework.xingyun.export.handlers; - -import com.lframework.starter.common.exceptions.ClientException; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.FileUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.components.excel.ExcelMultipartWriterSheetBuilder; -import com.lframework.starter.web.components.security.AbstractUserDetails; -import com.lframework.starter.web.components.security.SecurityUtil; -import com.lframework.starter.web.components.upload.client.dto.UploadDto; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.ExcelUtil; -import com.lframework.starter.web.utils.UploadUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; -import com.lframework.xingyun.export.entity.ExportTask; -import com.lframework.xingyun.export.service.ExportTaskService; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class ExportTaskHandler { - - // 每页条数 - private static final int PER_PAGE_SIZE = 10000; - - // 上报处理条数的攒批数量 - private static final int COUNT_BATCH_SIZE = 100; - - private ExportTaskWorker exportTaskWorker; - - private long timeout; - - private int curCount; - - private String taskId; - - public ExportTaskHandler(String taskId, ExportTaskWorker exportTaskWorker, - long timeout) { - this.taskId = taskId; - this.exportTaskWorker = exportTaskWorker; - this.timeout = timeout; - } - - public void execute(String json) { - - ExportTaskService exportTaskService = ApplicationUtil.getBean(ExportTaskService.class); - - ExportTask exportTask = exportTaskService.getById(taskId); - - String tmpLocation = ApplicationUtil.getEnv().getProperty("spring.servlet.multipart.location"); - tmpLocation = tmpLocation.endsWith(File.separator) ? tmpLocation : tmpLocation + File.separator; - try { - // 将导出任务状态置为正在导出 - exportTaskService.setExporting(taskId); - - P params = exportTaskWorker.parseParams(json); - - long beginTs = System.currentTimeMillis(); - int pageIndex = 1; - PageResult pageResult = exportTaskWorker.getDataList(pageIndex, PER_PAGE_SIZE, params); - this.checkCurrentUser(); - long totalCount = pageResult.getTotalCount(); - // 上报总数据条数 - exportTaskService.setTotalCount(taskId, totalCount); - - File xlsxFile = FileUtil.newFile(tmpLocation + taskId + ".xlsx"); - ExcelMultipartWriterSheetBuilder builder = ExcelUtil.multipartExportXlsx(xlsxFile, "Sheet1", - exportTaskWorker.getModelClass()); - try { - do { - long calcTs = System.currentTimeMillis() - beginTs; - if (calcTs > timeout * 1000L) { - throw new DefaultClientException( - "导出任务已执行" + (calcTs / 1000) + "秒，已超出最大执行时间" + timeout - + "秒，无法导出。"); - } - List dataList = pageResult.getDatas(); - List modelList = new ArrayList<>(dataList.size()); - for (D data : dataList) { - M model = exportTaskWorker.exportData(data); - modelList.add(model); - // 上报处理条数 - this.reportCurCount(); - } - - builder.doWrite(modelList); - - pageResult = exportTaskWorker.getDataList(++pageIndex, PER_PAGE_SIZE, params); - this.checkCurrentUser(); - } while (pageResult.isHasNext()); - } finally { - builder.finish(); - } - - UploadDto uploadDto = UploadUtil.upload(xlsxFile, - CollectionUtil.toList("export-task", exportTask.getCreateById()), true); - - // 将导出任务状态置为导出完成 - exportTaskService.setSuccess(taskId, uploadDto.getUploadType(), uploadDto.getObjectName(), - FileUtil.readableFileSize(xlsxFile.length())); - } catch (ClientException e) { - this.handleError(e); - } catch (Exception e) { - log.error(e.getMessage(), e); - this.handleError(e); - } - } - - protected void reportCurCount() { - this.curCount++; - if (this.curCount >= COUNT_BATCH_SIZE) { - ExportTaskService exportTaskService = ApplicationUtil.getBean(ExportTaskService.class); - exportTaskService.addCurCount(taskId, this.curCount); - this.curCount = 0; - } - } - - /** - * 处理异常 - * - * @param e - */ - protected void handleError(Exception e) { - ExportTaskService exportTaskService = ApplicationUtil.getBean(ExportTaskService.class); - // 将导出任务状态置为失败 - exportTaskService.setFail(taskId, - StringUtil.isBlank(e.getMessage()) ? e.toString() : e.getMessage()); - - exportTaskWorker.handleError(e); - } - - protected void checkCurrentUser() { - // 必须一直检测session是否在线，否则可能会导致查出的数据超出了当前用户可访问的数据 - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); - if (currentUser == null || SecurityUtil.getSessionByLoginId(currentUser.getLoginId()) == null) { - throw new DefaultClientException("导出用户已退出登录，无法导出"); - } - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/impl/ExportTaskServiceImpl.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/impl/ExportTaskServiceImpl.java deleted file mode 100644 index 390e33943d264a59f0a3948a9bcb83652e6e3c9a..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/impl/ExportTaskServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.lframework.xingyun.export.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.exceptions.impl.DefaultSysException; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.xingyun.core.service.SecurityUploadRecordService; -import com.lframework.xingyun.export.dto.ExportTaskSummaryDto; -import com.lframework.xingyun.export.entity.ExportTask; -import com.lframework.xingyun.export.enums.ExportTaskStatus; -import com.lframework.xingyun.export.events.ExportTaskNotifyEvent; -import com.lframework.xingyun.export.mappers.ExportTaskMapper; -import com.lframework.xingyun.export.service.ExportTaskService; -import java.time.LocalDateTime; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Slf4j -@Service -public class ExportTaskServiceImpl extends BaseMpServiceImpl - implements ExportTaskService { - - @Autowired - private SecurityUploadRecordService securityUploadRecordService; - - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(ExportTask task) { - this.save(task); - - ApplicationUtil.publishEvent(new ExportTaskNotifyEvent(this, task.getCreateById())); - return task.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void setExporting(String id) { - - ExportTask task = this.getById(id); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(ExportTask.class) - .eq(ExportTask::getId, id) - .eq(ExportTask::getStatus, ExportTaskStatus.CREATED) - .set(ExportTask::getStatus, ExportTaskStatus.EXPORTING); - - if (!this.update(updateWrapper)) { - log.error("导出任务 ID {} 设置为 正在导出 失败", id); - throw new DefaultSysException( - "导出任务设置为“" + ExportTaskStatus.EXPORTING.getDesc() + "”失败"); - } - - ApplicationUtil.publishEvent(new ExportTaskNotifyEvent(this, task.getCreateById())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void setSuccess(String id, String uploadType, String objectName, String fileSize) { - - ExportTask task = this.getById(id); - String recordId = securityUploadRecordService.create(uploadType, objectName); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(ExportTask.class) - .eq(ExportTask::getId, id) - .in(ExportTask::getStatus, ExportTaskStatus.CREATED, ExportTaskStatus.EXPORTING) - .set(ExportTask::getRecordId, recordId) - .set(ExportTask::getStatus, ExportTaskStatus.SUCCESS) - .set(ExportTask::getFinishTime, LocalDateTime.now()) - .set(ExportTask::getFileSize, fileSize) - .setSql("cur_count = total_count"); - if (!this.update(updateWrapper)) { - log.error("导出任务 ID {} 设置为 导出成功 失败", id); - throw new DefaultSysException( - "导出任务设置为“" + ExportTaskStatus.SUCCESS.getDesc() + "”失败"); - } - ApplicationUtil.publishEvent(new ExportTaskNotifyEvent(this, task.getCreateById())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void setFail(String id, String errorMsg) { - ExportTask task = this.getById(id); - Wrapper updateWrapper = Wrappers.lambdaUpdate(ExportTask.class) - .eq(ExportTask::getId, id) - .set(ExportTask::getStatus, ExportTaskStatus.FAIL) - .set(ExportTask::getErrorMsg, errorMsg) - .set(ExportTask::getFinishTime, LocalDateTime.now()); - if (!this.update(updateWrapper)) { - log.error("导出任务 ID {} 设置为 导出失败 失败", id); - throw new DefaultSysException( - "导出任务设置为“" + ExportTaskStatus.FAIL.getDesc() + "”失败"); - } - ApplicationUtil.publishEvent(new ExportTaskNotifyEvent(this, task.getCreateById())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void setTotalCount(String id, Long totalCount) { - Wrapper updateWrapper = Wrappers.lambdaUpdate(ExportTask.class) - .eq(ExportTask::getId, id) - .eq(ExportTask::getStatus, ExportTaskStatus.EXPORTING) - .set(ExportTask::getTotalCount, totalCount); - - if (!this.update(updateWrapper)) { - log.error("导出任务 ID {} 设置 数据总条数 失败", id); - throw new DefaultSysException( - "导出任务设置数据总条数失败"); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void addCurCount(String id, int addCount) { - Wrapper updateWrapper = Wrappers.lambdaUpdate(ExportTask.class) - .eq(ExportTask::getId, id) - .eq(ExportTask::getStatus, ExportTaskStatus.EXPORTING) - .setSql("cur_count = cur_count + " + addCount); - - if (!this.update(updateWrapper)) { - log.error("导出任务 ID {} 设置 当前导出条数 失败", id); - throw new DefaultSysException( - "导出任务设置当前导出条数失败"); - } - } - - @Override - public ExportTaskSummaryDto getSummaryByUserId(String userId) { - return getBaseMapper().getSummaryByUserId(userId); - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/listeners/app/ExportTaskNotifyListener.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/listeners/app/ExportTaskNotifyListener.java deleted file mode 100644 index 8cb72f6b8d5cbbf128a72e76902dc0991c129034..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/listeners/app/ExportTaskNotifyListener.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.export.listeners.app; - -import com.lframework.starter.web.dto.WsPushData; -import com.lframework.starter.websocket.components.WsDataPusher; -import com.lframework.starter.websocket.events.UserConnectEvent; -import com.lframework.xingyun.export.events.ExportTaskNotifyEvent; -import com.lframework.xingyun.export.service.ExportTaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; -import org.springframework.transaction.event.TransactionalEventListener; - -@Component -public class ExportTaskNotifyListener implements ApplicationListener { - - @Autowired - private WsDataPusher wsDataPusher; - - @Autowired - private ExportTaskService exportTaskService; - - @TransactionalEventListener - public void execute(ExportTaskNotifyEvent event) { - this.notify(event.getCreateById()); - } - - @Override - public void onApplicationEvent(UserConnectEvent event) { - this.notify(event.getUser().getId()); - } - - private void notify(String userId) { - // 发送广播 - WsPushData pushData = new WsPushData(); - pushData.setBizType("exportTask"); - pushData.setDataObj(exportTaskService.getSummaryByUserId(userId)); - pushData.setIncludeUserId(userId); - - wsDataPusher.push(pushData); - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/listeners/mq/ExportTaskListener.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/listeners/mq/ExportTaskListener.java deleted file mode 100644 index dad03f2f2f1859532c7c7b060503f6fd733f4317..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/listeners/mq/ExportTaskListener.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.lframework.xingyun.export.listeners.mq; - -import cn.hutool.crypto.SecureUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.exceptions.ClientException; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.ReflectUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.mq.core.producer.MqProducer; -import com.lframework.starter.web.components.security.AbstractUserDetails; -import com.lframework.starter.web.components.security.SecurityUtil; -import com.lframework.starter.web.service.SysConfService; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.core.dto.export.AddExportTaskDto; -import com.lframework.xingyun.core.queue.MqConstants; -import com.lframework.xingyun.core.queue.MqStringPool; -import com.lframework.xingyun.export.dto.ExecuteExportTaskDto; -import com.lframework.xingyun.export.entity.ExportTask; -import com.lframework.xingyun.export.enums.ExportTaskStatus; -import com.lframework.xingyun.export.handlers.ExportTaskHandler; -import com.lframework.xingyun.export.service.ExportTaskService; -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("exportTaskListener") -public class ExportTaskListener { - - @Autowired - private ExportTaskService exportTaskService; - - @Autowired - private MqProducer mqProducer; - - @Autowired - private SysConfService sysConfService; - - - @RabbitListener(bindings = { - @QueueBinding(value = @Queue(value = MqStringPool.ADD_EXPORT_TASK_QUEUE), key = MqStringPool.ADD_EXPORT_TASK_ROUTING_KEY, exchange = @Exchange(value = MqStringPool.ADD_EXPORT_TASK_EXCHANGE))}, concurrency = "2") - public void addExportTask(Message message) { - - AddExportTaskDto dto = message.getPayload(); - - log.info("接收到新增导出任务MQ message = {}", dto); - - AbstractUserDetails currentUser = SecurityUtil.getUserByToken(dto.getToken()); - if (currentUser == null) { - log.info("导出用户已退出登录，无法导出"); - return; - } - - try { - SecurityUtil.setCurrentUser(currentUser); - - // 新增导出任务 - ExportTask task = new ExportTask(); - task.setId(IdUtil.getId()); - task.setName(dto.getName()); - task.setStatus(ExportTaskStatus.CREATED); - task.setReqClassName(dto.getReqClassName()); - task.setReqParams(dto.getReqParams()); - - task.setReqParamsSign(SecureUtil.md5(dto.getReqClassName() + ":" + dto.getReqParams())); - - exportTaskService.create(task); - - ExecuteExportTaskDto taskDto = new ExecuteExportTaskDto(); - taskDto.setTaskId(task.getId()); - taskDto.setToken(dto.getToken()); - - mqProducer.sendMessage(MqConstants.EXECUTE_EXPORT_TASK, taskDto); - - } finally { - SecurityUtil.removeCurrentUser(); - } - } - - @RabbitListener(bindings = { - @QueueBinding(value = @Queue(value = MqStringPool.EXECUTE_EXPORT_TASK_QUEUE), key = MqStringPool.EXECUTE_EXPORT_TASK_ROUTING_KEY, exchange = @Exchange(value = MqStringPool.EXECUTE_EXPORT_TASK_EXCHANGE))}) - public void executeExportTask(Message message) { - - ExecuteExportTaskDto dto = message.getPayload(); - - log.info("接收到执行导出任务MQ message = {}", dto); - - ExportTask task = exportTaskService.getById(dto.getTaskId()); - AbstractUserDetails currentUser = SecurityUtil.getUserByToken(dto.getToken()); - - try { - if (currentUser == null) { - throw new DefaultClientException("导出用户已退出登录，无法导出"); - } - - SecurityUtil.setCurrentUser(currentUser); - - Wrapper checkWrapper = Wrappers.lambdaQuery(ExportTask.class) - .eq(ExportTask::getReqParamsSign, task.getReqParamsSign()) - .in(ExportTask::getStatus, ExportTaskStatus.CREATED, ExportTaskStatus.EXPORTING) - .ne(ExportTask::getId, task.getId()); - if (exportTaskService.count(checkWrapper) > 0) { - throw new DefaultClientException("导出任务重复，请勿重新导出。"); - } - - ExportTaskHandler exportTaskHandler = new ExportTaskHandler(task.getId(), - ReflectUtil.newInstance(task.getReqClassName()), - sysConfService.getLong("export.timeout", 600L)); - exportTaskHandler.execute(task.getReqParams()); - } catch (ClientException e) { - exportTaskService.setFail(task.getId(), - StringUtil.isBlank(e.getMessage()) ? e.toString() : e.getMessage()); - } catch (Exception e) { - log.error(e.getMessage(), e); - exportTaskService.setFail(task.getId(), - StringUtil.isBlank(e.getMessage()) ? e.toString() : e.getMessage()); - } finally { - SecurityUtil.removeCurrentUser(); - } - } -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/mappers/ExportTaskMapper.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/mappers/ExportTaskMapper.java deleted file mode 100644 index 81d7e0c0dfae4b401cccd38df35500ce8895648f..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/mappers/ExportTaskMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.export.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.export.dto.ExportTaskSummaryDto; -import com.lframework.xingyun.export.entity.ExportTask; - -/** - *

- * ExportTaskMapper 接口 - *

- * - * @author zmj - * @since 2025-04-10 - */ -public interface ExportTaskMapper extends BaseMapper { - - /** - * 根据用户ID统计导出任务 - * - * @param userId - * @return - */ - ExportTaskSummaryDto getSummaryByUserId(String userId); -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/service/ExportTaskService.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/service/ExportTaskService.java deleted file mode 100644 index 488ccfef18d53b6c9217f26d76ffbf3ea6da7300..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/service/ExportTaskService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.lframework.xingyun.export.service; - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.export.dto.ExportTaskSummaryDto; -import com.lframework.xingyun.export.entity.ExportTask; - -/** - * 导出任务 Service - * - * @author zmj - */ -public interface ExportTaskService extends BaseMpService { - - /** - * 新增 - * - * @param task - * @return - */ - String create(ExportTask task); - - /** - * 设置为正在导出 - * - * @param id - */ - void setExporting(String id); - - /** - * 设置为成功 - * - * @param id - * @param uploadType - */ - void setSuccess(String id, String uploadType, String objectName, String fileSize); - - /** - * 设置为失败 - * - * @param id - * @param errorMsg - */ - void setFail(String id, String errorMsg); - - /** - * 设置数据总条数 - * - * @param id - * @param totalCount - */ - void setTotalCount(String id, Long totalCount); - - /** - * 增加当前导出条数 - * - * @param id - * @param addCount - */ - void addCurCount(String id, int addCount); - - /** - * 根据用户ID统计导出任务 - * - * @param userId - * @return - */ - ExportTaskSummaryDto getSummaryByUserId(String userId); -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/vo/QueryFailExportTaskVo.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/vo/QueryFailExportTaskVo.java deleted file mode 100644 index d90283edda056cdfd276cad63182e0c1a0d60060..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/vo/QueryFailExportTaskVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.export.vo; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryFailExportTaskVo extends PageVo { - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-export/src/main/java/com/lframework/xingyun/export/vo/QuerySuccessExportTaskVo.java b/xingyun-export/src/main/java/com/lframework/xingyun/export/vo/QuerySuccessExportTaskVo.java deleted file mode 100644 index b065f0d2dfcb91391a936e02c75eaa54ad8e3138..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/java/com/lframework/xingyun/export/vo/QuerySuccessExportTaskVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.export.vo; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySuccessExportTaskVo extends PageVo { - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-export/src/main/java/lombok.config b/xingyun-export/src/main/java/lombok.config deleted file mode 100644 index 8e37527a927dbd888d6f94d30ffd32395bb97676..0000000000000000000000000000000000000000 --- a/xingyun-export/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-export/src/main/resources/mappers/ExportTaskMapper.xml b/xingyun-export/src/main/resources/mappers/ExportTaskMapper.xml deleted file mode 100644 index 4ff3a84d8dcbd395db99fe7b7dc83b11d26dbba5..0000000000000000000000000000000000000000 --- a/xingyun-export/src/main/resources/mappers/ExportTaskMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/xingyun-sc/pom.xml b/xingyun-sc/pom.xml index cf8fe87d5f7219aa3bab368192ecace0d1b8598b..12fa2137a6ae62bd65c9935a5a64dd0aad78e135 100644 --- a/xingyun-sc/pom.xml +++ b/xingyun-sc/pom.xml @@ -22,10 +22,5 @@ com.lframework xingyun-basedata - - - com.lframework - xingyun-sys - diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetBo.java index b07b16ec5fa7a0671aa0b98329325520edc2c1cb..7864289a6cd85b4a5f7b804c993436a46a4b6864 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetBo.java @@ -3,18 +3,18 @@ package com.lframework.xingyun.sc.bo.logistics; 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.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.DicCityService; import com.lframework.xingyun.sc.dto.logistics.LogisticsSheetFullDto; import com.lframework.xingyun.sc.dto.logistics.LogisticsSheetFullDto.DetailDto; import com.lframework.xingyun.sc.entity.RetailOutSheet; @@ -22,7 +22,7 @@ import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetDeliveryBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetDeliveryBo.java index 2ff90e33745f6ab748cc6a3f28c62f01ec8d00b2..8ac69ade88c490dc466e1f159d85e8d972d5cbf9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetDeliveryBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/GetLogisticsSheetDeliveryBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.logistics; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.LogisticsSheet; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBizOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBizOrderBo.java index b629dd3a10a658ae6c5f120d06244badb481b735..d0d464f5542b3499079310eb155f8ccb448c4cff 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBizOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBizOrderBo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.bo.logistics; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBo.java index d243bd9ee2b74966a80379058f5ae7cb38fba1fe..51b4aedaf465ad3a80d3cd85443b910ad8ebea4e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/logistics/QueryLogisticsSheetBo.java @@ -1,14 +1,14 @@ package com.lframework.xingyun.sc.bo.logistics; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import com.lframework.xingyun.basedata.service.logistics.LogisticsCompanyService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.LogisticsSheet; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/paytype/OrderPayTypeBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/paytype/OrderPayTypeBo.java index d55ae50c7e2d1926dfa2a829de9abc4ecaca1a7e..06e3a9f6593c4ad80877327e1fedb73e8816d756 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/paytype/OrderPayTypeBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/paytype/OrderPayTypeBo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.bo.paytype; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.sc.entity.OrderPayType; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java index 4c2b016ba84ee8b611e6e6d0184f3496b438f5f0..27a0da7c3bfda0f319cf2af19be635156206436c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.constants.StringPool; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo; @@ -18,7 +18,7 @@ import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; @@ -153,6 +153,12 @@ public class GetPurchaseOrderBo extends BaseBo { @ApiModelProperty("拒绝原因") private String refuseReason; + /** + * 关联的审批流程ID + */ + @ApiModelProperty(value = "关联的审批流程ID") + private String flowInstanceId; + /** * 订单明细 */ diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java index 3defc5a6959c2fe0fadc352f54bc930c7df21652..b5a0d1381bb068db98b0e2048fe374f37e861fed 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; @@ -16,7 +15,7 @@ import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseProductDto; import com.lframework.xingyun.sc.enums.PurchaseOrderStatus; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -24,7 +23,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintPurchaseOrderBo extends BasePrintDataBo { +public class PrintPurchaseOrderBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderSelectorBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderSelectorBo.java index 7a09de99a065c67b1f73ba8eade46323a900bb20..28ca8f275cbbf91cd6232f3943776b1d41f66fb5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderSelectorBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderSelectorBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.purchase; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java index 8a45984180d68f732a4b4d2f4b99e1078c1058a8..57ca0f140b4c2e80a98263c33c644f6b0ebf73da 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java @@ -5,19 +5,19 @@ import com.lframework.starter.common.functions.SFunction; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderWithReceiveDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseProductDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseProductBo.java index eb392832b5b827740245e4c43f0ead3dbaa0135c..52dc03595acfc1d8371a8cc916cd9020118d4d26 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseProductBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.purchase; import com.fasterxml.jackson.annotation.JsonIgnore; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.dto.purchase.PurchaseProductDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.stock.ProductStockService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderBo.java index 0c3fd309dd24def611e01c390c4899f7ec59e957..51ae660d20b5450d2f134ad0096cb68614d34506 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderBo.java @@ -3,14 +3,14 @@ package com.lframework.xingyun.sc.bo.purchase; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.sc.entity.PurchaseOrder; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; @@ -87,6 +87,12 @@ public class QueryPurchaseOrderBo extends BaseBo { @ApiModelProperty("采购金额") private BigDecimal totalAmount; + /** + * 关联的审批流程ID + */ + @ApiModelProperty("关联的审批流程ID") + private String flowInstanceId; + /** * 备注 */ diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderWithReceiveBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderWithReceiveBo.java index db4fa77eecc92afd7a24e2287f7e6924bf8b773c..8b0825df5c583619dda01eddf1495db680016685 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderWithReceiveBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/QueryPurchaseOrderWithReceiveBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.purchase; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/config/GetPurchaseConfigBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/config/GetPurchaseConfigBo.java index be676a0dcccbc92212568afeae8ede914c7b1005..c7ed4303e5db6c8a230f6fb95825588dfbfc5964 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/config/GetPurchaseConfigBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/config/GetPurchaseConfigBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.purchase.config; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.PurchaseConfig; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,6 +32,24 @@ public class GetPurchaseConfigBo extends BaseBo { @ApiModelProperty("采购退货单是否多次关联采购收货单") private Boolean purchaseReturnMultipleRelateReceive; + /** + * 采购订单是否开启审批流程 + */ + @ApiModelProperty("采购订单是否开启审批流程") + private Boolean purchaseRequireBpm; + + /** + * 采购订单关联的审批流程ID + */ + @ApiModelProperty("采购订单关联的审批流程ID") + private String purchaseBpmProcessId; + + /** + * 采购订单关联的审批流程编号 + */ + @ApiModelProperty("采购订单关联的审批流程编号") + private String purchaseBpmProcessCode; + public GetPurchaseConfigBo() { } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetPaymentDateBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetPaymentDateBo.java index cf8d4ab54ddfe57b014613abc0bcb7a4d5651e04..a914581fa8c7cec57eb0905e24a7c27d0abb9527 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetPaymentDateBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetPaymentDateBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.sc.bo.purchase.receive; 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.core.bo.BaseBo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java index 5a415e00791b82a110bc1af4e6cffd449abdb2b7..8f0a32a78bf7cbea6c0c47d0c5d9e73920eb638e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.constants.StringPool; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo; @@ -21,7 +21,7 @@ import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderDetailService; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java index 0b0782a2612f1475fedd966d0ba8ed91f993bf80..73f2679297ad34b343ed3bcefa9de53da67018a2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; @@ -17,7 +16,7 @@ import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetFullDto; import com.lframework.xingyun.sc.entity.PurchaseOrder; import com.lframework.xingyun.sc.enums.ReceiveSheetStatus; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -25,7 +24,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintReceiveSheetBo extends BasePrintDataBo { +public class PrintReceiveSheetBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetBo.java index d83b333e9d66c134785f9a95fae5ba346138fb38..f49a7c1afc9e2c3e78c4a9bd03b44f0fea886abc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.purchase.receive; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; @@ -12,7 +12,7 @@ import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.sc.entity.PurchaseOrder; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetWithReturnBo.java index 92a7b1093e15d6654685fc35c67d8ae1d4ccbabd..58977b693f7b669d2838a4b5d3ef289ee2a4c830 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/QueryReceiveSheetWithReturnBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.purchase.receive; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetSelectorBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetSelectorBo.java index ac9729fd7597ee4fb9b5a49c89d82687aeeebf62..bef07482b339c73b24949a8c31c02122e2e786f2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetSelectorBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetSelectorBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.purchase.receive; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java index 2885026bec397e6fa7448db095baca957b93904e..dca61bb11a6bbc63a0856197147949fc02c7299f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java @@ -5,19 +5,19 @@ import com.lframework.starter.common.functions.SFunction; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.dto.purchase.PurchaseProductDto; import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetWithReturnDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java index 4320aa6c9e24063af6105f4dcb2763d11dca7385..57a022702d2fc7ba480872342990dc490ed68a2d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.constants.StringPool; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo; @@ -22,7 +22,7 @@ import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetDetailService; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; @@ -316,9 +316,9 @@ public class GetPurchaseReturnBo extends BaseBo { private Integer returnNum; /** - * 采购价 + * 退货价 */ - @ApiModelProperty("采购价") + @ApiModelProperty("退货价") private BigDecimal purchasePrice; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java index 0e26a618286e536aff0234c4d09ad4b5ff9a17ff..7c42beeee59cf24007fa89d4aafd552b4f24d420 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; @@ -18,7 +17,7 @@ import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.enums.PurchaseReturnStatus; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -26,7 +25,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintPurchaseReturnBo extends BasePrintDataBo { +public class PrintPurchaseReturnBo extends BaseBo { /** * 单号 @@ -217,9 +216,9 @@ public class PrintPurchaseReturnBo extends BasePrintDataBo { +public class PrintRetailOutSheetBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetBo.java index 7472030e7aaaeba193037ee2e1fdf89d581eaeb2..625e036768759766088652d70d199f12102385bc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetBo.java @@ -3,14 +3,14 @@ package com.lframework.xingyun.sc.bo.retail.out; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.RetailOutSheet; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetWithReturnBo.java index b87834c91844b883426b0490245dec7fbc823d05..7a80ef8be77921884e1abd812f7ee4bd60364aff 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/QueryRetailOutSheetWithReturnBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.retail.out; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/RetailOutSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/RetailOutSheetWithReturnBo.java index 7dc005fc62952981fab34d11c7d694cbbf9ceaf8..5551345b368b9c52984e2dc11f20ed6109d287ba 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/RetailOutSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/RetailOutSheetWithReturnBo.java @@ -5,19 +5,19 @@ import com.lframework.starter.common.functions.SFunction; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.dto.retail.RetailProductDto; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetWithReturnDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/GetRetailReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/GetRetailReturnBo.java index 1e8d0574560fc0526f6840ec4a26dc23198696a0..63d4c8062da4e9ca0b87405ebe342fbe3a5d605c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/GetRetailReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/GetRetailReturnBo.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.constants.StringPool; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo; @@ -19,7 +19,7 @@ import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.retail.RetailOutSheetDetailLotService; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java index 89418493ffaf2d0c345c580e1833d2bf3428a678..7eb1c22a9cd450ed9537602dc16787dd3be45d24 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; @@ -17,7 +16,7 @@ import com.lframework.xingyun.sc.dto.retail.returned.RetailReturnFullDto; import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.enums.RetailReturnStatus; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -25,7 +24,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintRetailReturnBo extends BasePrintDataBo { +public class PrintRetailReturnBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/QueryRetailReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/QueryRetailReturnBo.java index c50ab5dbc578615b959a38bb7fb91413a5d3ee9e..7955c414f6cfdd45c6b1e3a90d468f2a2150e821 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/QueryRetailReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/QueryRetailReturnBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.retail.returned; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; @@ -12,7 +12,7 @@ import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java index 8e3f3a908b4faf51c0d00ced54d8899195f61e80..bfd1619a4f40d63b19370ce18ac24155d22837c0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java @@ -5,8 +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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.product.ProductService; @@ -19,7 +19,7 @@ import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java index c68842efb7bcade457e1cead7ea51bc42e7da0d7..a419925735c5b910ea24803348e06059c7de7083 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; @@ -16,7 +15,7 @@ import com.lframework.xingyun.sc.dto.sale.SaleOrderFullDto; import com.lframework.xingyun.sc.dto.sale.SaleProductDto; import com.lframework.xingyun.sc.enums.SaleOrderStatus; import com.lframework.xingyun.sc.service.sale.SaleOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -24,7 +23,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintSaleOrderBo extends BasePrintDataBo { +public class PrintSaleOrderBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderBo.java index 6cea644d5b75e4036dc010542c4e2b9f42a1ca3a..a65fbefcc8996cee68d89e1e7aa420ddcfbadc0c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderBo.java @@ -3,14 +3,14 @@ package com.lframework.xingyun.sc.bo.sale; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.SaleOrder; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderWithOutBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderWithOutBo.java index b5d7087fec29f1d253f6800af3a0aefbd49e9891..6d7212404e0a56ed2a31530dfc5c0f85d1d0f288 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderWithOutBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/QuerySaleOrderWithOutBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.sale; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java index 8884df8523276a4abc7e36338771713a817f6e3d..b07c48ae230b46da8acdb2ef97b980972b878cf2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java @@ -5,21 +5,21 @@ import com.lframework.starter.common.functions.SFunction; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.dto.sale.SaleOrderWithOutDto; import com.lframework.xingyun.sc.dto.sale.SaleProductDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java index fa3727c214c797351b70f94ee6cb5214ae9f05bc..c001415b4198af413127d412ab82d99b385cc022 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.bo.sale; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.dto.sale.SaleProductDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.stock.ProductStockService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/config/GetSaleConfigBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/config/GetSaleConfigBo.java index 91857b09fb87ff2258ff58df26357eb41afb16c4..bdbcacc85a13b627f06410d610aa470167346ca9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/config/GetSaleConfigBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/config/GetSaleConfigBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.sale.config; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.SaleConfig; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java index 01f1b2fe56f2503238f1315eb36482af6d86036c..4f92f323e5fed77cb711c73726595f0bf70be215 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.constants.StringPool; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.product.ProductService; @@ -23,7 +23,7 @@ import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.sale.SaleOrderDetailService; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java index 206d1e5be9ce03a9ccf1839c70ad2ad81a56ca06..eeea0f1a8ea8a2a4570b3c3e14656a14ba567a37 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; @@ -17,7 +16,7 @@ import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetFullDto; import com.lframework.xingyun.sc.entity.SaleOrder; import com.lframework.xingyun.sc.enums.SaleOutSheetStatus; import com.lframework.xingyun.sc.service.sale.SaleOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -25,7 +24,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintSaleOutSheetBo extends BasePrintDataBo { +public class PrintSaleOutSheetBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetBo.java index 79d9780425679b735e7b85863d8b229d5b53209e..bb2d67e990866af53b7984d77e92241fc2866d21 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.sale.out; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; @@ -12,7 +12,7 @@ import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.SaleOrder; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.service.sale.SaleOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetWithReturnBo.java index b8b18119bdc1130c10bca7cb045b9c23d181f370..497c839a56ea18bc6ccf066a40b362a39d28e945 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/QuerySaleOutSheetWithReturnBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.sale.out; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java index 78ca850f2d5bcebb3846ab4a9131ae4706caa4a6..373e330e9bf820336d453b7bdd81c84ab8fc069c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java @@ -5,19 +5,19 @@ import com.lframework.starter.common.functions.SFunction; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.dto.sale.SaleProductDto; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetWithReturnDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java index 6c80b73ffb56c3e64e961a15523c394806b8c6b5..558811f3e46cd3e94b2679347ccd63c4f257e63a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.constants.StringPool; 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.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo; @@ -20,7 +20,7 @@ import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.service.sale.SaleOutSheetDetailLotService; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java index dd2de75d0fa6d0035920979c81fa1eee40b25a42..ecf3e38864746b06af7416aa5ed33a0413c50af7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java @@ -5,9 +5,8 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.bo.BasePrintDataBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; @@ -18,7 +17,7 @@ import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.enums.SaleReturnStatus; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.List; @@ -26,7 +25,7 @@ import java.util.stream.Collectors; import lombok.Data; @Data -public class PrintSaleReturnBo extends BasePrintDataBo { +public class PrintSaleReturnBo extends BaseBo { /** * 单号 diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/QuerySaleReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/QuerySaleReturnBo.java index 3d8c4df5b2f904c669bd9d215d433502b5cc8a8a..3c05e0f9731e41b357d20408bfd00d99e46ec75e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/QuerySaleReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/QuerySaleReturnBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.sale.returned; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; @@ -12,7 +12,7 @@ import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/QueryStockAdjustSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/QueryStockAdjustSheetBo.java index 2c9a9b8c1cf505e6a4f9a0ef1ab4d8b82beaa6b3..aa77f10a1d4a8389fe8552900dbabc279bbb2381 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/QueryStockAdjustSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/QueryStockAdjustSheetBo.java @@ -3,15 +3,15 @@ package com.lframework.xingyun.sc.bo.stock.adjust.stock; 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.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.StockAdjustReason; import com.lframework.xingyun.sc.entity.StockAdjustSheet; import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustReasonService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustProductBo.java index 8189f6d1228ac51151f022f9fc6b623ed1a402fd..6823c4c482b0e5c57930797eaf58a051fd61c960 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustProductBo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.bo.stock.adjust.stock; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.dto.stock.adjust.stock.StockAdjustProductDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.stock.ProductStockService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustSheetFullBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustSheetFullBo.java index 4ee27a27aca48fcb3f331c5a363cb593df5b155c..17e0bd55e4cef00e1b912c6d5d7e80929df2e65f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustSheetFullBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/StockAdjustSheetFullBo.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.annotations.convert.EnumConvert; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; @@ -22,7 +22,7 @@ import com.lframework.xingyun.sc.entity.StockAdjustReason; import com.lframework.xingyun.sc.enums.StockAdjustSheetStatus; import com.lframework.xingyun.sc.service.stock.ProductStockService; import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustReasonService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/GetStockAdjustReasonBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/GetStockAdjustReasonBo.java index f9b7cd98344c0c5666c83222a9218839b7d885bb..08666bceabe6433fbdf4c438f38bb6fe76d59a4b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/GetStockAdjustReasonBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/GetStockAdjustReasonBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.stock.adjust.stock.reason; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.StockAdjustReason; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/QueryStockAdjustReasonBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/QueryStockAdjustReasonBo.java index 55a4123679cb0e68e99e8adc7a7a072aa021e940..9c1bb8eebbca5de0558dd4487a87e8eff26a9724 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/QueryStockAdjustReasonBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/QueryStockAdjustReasonBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.sc.bo.stock.adjust.stock.reason; 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.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.StockAdjustReason; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/StockAdjustReasonSelectorBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/StockAdjustReasonSelectorBo.java index 79811d9ac55e6dff5c5b66aa939f114f3f83cf04..9dc99f24e6e3c654486302bb4f4f7ee3c59f351d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/StockAdjustReasonSelectorBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/adjust/stock/reason/StockAdjustReasonSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.stock.adjust.stock.reason; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.StockAdjustReason; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/QueryProductStockBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/QueryProductStockBo.java index 7759e6063cef37f27d117a4c98ced25125710171..d40f9df2c5ae738b47d2f546f5c1e18144eacecd 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/QueryProductStockBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/QueryProductStockBo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.bo.stock.product; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/log/QueryProductStockLogBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/log/QueryProductStockLogBo.java index 64294e310d83881768a8e381bd88c8204872c275..e40f6ed3b0b4ab72f72559484f70aadff8dcf376 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/log/QueryProductStockLogBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/product/log/QueryProductStockLogBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.stock.product.log; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/config/GetTakeStockConfigBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/config/GetTakeStockConfigBo.java index 7d795474c9d8b94e16a6ee1b8ba9aad4ca4fc6cb..98244221ccfdfc7257e6443a1fb3d26fd0fb36c6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/config/GetTakeStockConfigBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/config/GetTakeStockConfigBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.stock.take.config; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.TakeStockConfig; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/GetTakeStockPlanBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/GetTakeStockPlanBo.java index ed316a73813699a3d5a5906c4f10f5f042bc4b2e..9cce569a8a5353be95e0efd23131511224d98e3e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/GetTakeStockPlanBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/GetTakeStockPlanBo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.bo.stock.take.plan; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.entity.StoreCenter; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanBo.java index ec7beb691c2e815c29eb6bbfe318c7bbb0e401d8..7a7549b1a8c5e37773af775f3d32c3e873b0c6f4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.take.plan; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.entity.StoreCenter; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanProductBo.java index 1e962babd729d003cffbf79459f605c944164541..6ea4bbb848cd7aaf9051a40a3acc60f9517fc793 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/QueryTakeStockPlanProductBo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.bo.stock.take.plan; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanFullBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanFullBo.java index 6da7a8b4007265c6097fff8b5e4ecc5eae65da32..43c507b861843f3d61f19787217ef575226e6d7f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanFullBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanFullBo.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanSelectorBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanSelectorBo.java index 9a60e9c67b82c8f3cd0df413407e60f4396374fe..cb478892dd73813153726a0418c0f666e7bdb4e4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanSelectorBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/plan/TakeStockPlanSelectorBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.take.plan; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.TakeStockPlan; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/GetPreTakeStockSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/GetPreTakeStockSheetBo.java index c8faa1b5c0509f5e66c4c9535b3f47c7a5704c87..18f75f57963c7374eccfcdfdeadec57fe952f52d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/GetPreTakeStockSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/GetPreTakeStockSheetBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.take.pre; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockProductBo.java index d8607bef1627324448020c5c2e274bd55c410071..2707e94bfe404be3dbefbab531a75583cc0e0709 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockProductBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.stock.take.pre; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.dto.stock.take.pre.PreTakeStockProductDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockSheetSelectorBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockSheetSelectorBo.java index a24ef59dcc6d45bf968b1f1cdd0b1c66fa1d5499..28fcbb52b3bc658dfb0a7b0f1c198577383f0f7f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockSheetSelectorBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/PreTakeStockSheetSelectorBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.take.pre; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.PreTakeStockSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetBo.java index 46814b85513f673f7687a889c1f92187d33cef26..0846e71cb69369ade350ea8cd4093d4209a7c0b4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.take.pre; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.PreTakeStockSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetProductBo.java index 179439a1d6c4e733d95e3d65b9235471d36d043d..b23610de63b0bec7c414308ac454f0e33e23b38f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/pre/QueryPreTakeStockSheetProductBo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.bo.stock.take.pre; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/QueryTakeStockSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/QueryTakeStockSheetBo.java index 3e0221d3899d8584141f7b1366e8d50b00f54d59..c637335eb2ca85836827765153a15192e795b6eb 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/QueryTakeStockSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/QueryTakeStockSheetBo.java @@ -3,14 +3,14 @@ package com.lframework.xingyun.sc.bo.stock.take.sheet; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.TakeStockPlan; import com.lframework.xingyun.sc.entity.TakeStockSheet; import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetFullBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetFullBo.java index dc42a99222eedeb8a57ca5d590370fc79d691569..a1cfca0c0925adb53a4fdbd22da0ad2984cac1d2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetFullBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetFullBo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.bo.stock.take.sheet; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; @@ -23,7 +23,7 @@ import com.lframework.xingyun.sc.service.stock.take.PreTakeStockSheetService; import com.lframework.xingyun.sc.service.stock.take.TakeStockConfigService; import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanDetailService; import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetProductBo.java index 79c84f4ce772d77b00ecaa58c539e8b922c79014..3c58d3203b183529b48927551cb09eb499d6d034 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/take/sheet/TakeStockSheetProductBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.take.sheet; import com.fasterxml.jackson.annotation.JsonIgnore; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.dto.stock.take.plan.GetTakeStockPlanDetailProductDto; import com.lframework.xingyun.sc.dto.stock.take.sheet.TakeStockSheetProductDto; import com.lframework.xingyun.sc.entity.ProductStock; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderBo.java index 5854149d117c3f0111c37ece4c58c20e06889030..230cf12e2162b628c888ecfed0e5b6bb3db3e08d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderBo.java @@ -3,12 +3,12 @@ package com.lframework.xingyun.sc.bo.stock.transfer; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.ScTransferOrder; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderDetailReceiveBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderDetailReceiveBo.java index 204d49d99b0f8bc28ef43a52d6ca78c917a77979..a9df780cda8e9859c5a318a2a25cc51c6ac98843 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderDetailReceiveBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/QueryScTransferOrderDetailReceiveBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.bo.stock.transfer; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.sc.entity.ScTransferOrderDetailReceive; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferOrderFullBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferOrderFullBo.java index dba3dec67dd3cdc1c0f0b91f719f1f9d9c7e3523..0368a349d45b3755ec6706e29b925d11a8ea78fe 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferOrderFullBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferOrderFullBo.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; 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.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; @@ -19,7 +19,7 @@ import com.lframework.xingyun.sc.dto.stock.transfer.ScTransferOrderFullDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.enums.ScTransferOrderStatus; import com.lframework.xingyun.sc.service.stock.ProductStockService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferProductBo.java index c57bd6f13678c7ea22f85aefa5c159a628dd721d..247dd432b67c77a16e577a245da7bdde5ba5561f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/transfer/ScTransferProductBo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.bo.stock.transfer; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.dto.stock.transfer.ScTransferProductDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.stock.ProductStockService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningBo.java index f50bc3ba2a74ac4aac333318144182b973b853b5..020e45ed70aec645d5b1795ac5c7e3f03f1dbe68 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.warning; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.product.ProductService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningNotifyBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningNotifyBo.java index 1c37aa7e811d33a84a9e4e5c075306687e6ee7f7..b5cb9c040922d7a7ba76957a39fd28301e0dd752 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningNotifyBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/GetProductStockWarningNotifyBo.java @@ -1,10 +1,10 @@ package com.lframework.xingyun.sc.bo.stock.warning; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.entity.ProductStockWarningNotify; -import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; -import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupService; +import com.lframework.starter.web.inner.entity.SysNotifyGroup; +import com.lframework.starter.web.inner.service.system.SysNotifyGroupService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/QueryProductStockWarningBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/QueryProductStockWarningBo.java index 673d384fb60b4b5f4abc1d4806079f5521c5580a..67acb2f1432d5ebe364e47bd2ba2032141760e5e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/QueryProductStockWarningBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/stock/warning/QueryProductStockWarningBo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.bo.stock.warning; 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.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.product.ProductService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java index d5f51589abeb5aa5f997bdd9234e36b90df392af..cde28a41bcca13badc6db22b9e3a801267fbe846 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ScSelectorController.java @@ -1,11 +1,11 @@ package com.lframework.xingyun.sc.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.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.sc.bo.paytype.OrderPayTypeBo; import com.lframework.xingyun.sc.bo.purchase.PurchaseOrderSelectorBo; import com.lframework.xingyun.sc.bo.purchase.receive.ReceiveSheetSelectorBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/logistics/LogisticsSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/logistics/LogisticsSheetController.java index 4d3702875feed9e96823487118d9436205d62201..3620aa3dbc3c30b40ffa846306c417bf8b8bd826 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/logistics/LogisticsSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/logistics/LogisticsSheetController.java @@ -3,15 +3,15 @@ package com.lframework.xingyun.sc.controller.logistics; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; -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.EnumUtil; -import com.lframework.starter.web.utils.ExcelUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.logistics.GetLogisticsSheetBo; import com.lframework.xingyun.sc.bo.logistics.GetLogisticsSheetDeliveryBo; import com.lframework.xingyun.sc.bo.logistics.QueryLogisticsSheetBizOrderBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseConfigController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseConfigController.java index d02361751fc9a80ee22f869c125942939a1cd2ea..ec7508bf4162ff89431953191fc5b4a390172bf3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseConfigController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseConfigController.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.controller.purchase; -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.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.sc.bo.purchase.config.GetPurchaseConfigBo; import com.lframework.xingyun.sc.entity.PurchaseConfig; import com.lframework.xingyun.sc.service.purchase.PurchaseConfigService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseOrderController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseOrderController.java index 7e6b1684bb2ccc19c6120b1a12c7b351f6c2acfc..58030caae6ab0e7fc4d8d7a6b001813f5a53e585 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseOrderController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseOrderController.java @@ -3,15 +3,14 @@ package com.lframework.xingyun.sc.controller.purchase; 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.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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.purchase.GetPurchaseOrderBo; import com.lframework.xingyun.sc.bo.purchase.PrintPurchaseOrderBo; import com.lframework.xingyun.sc.bo.purchase.PurchaseOrderWithReceiveBo; @@ -77,20 +76,17 @@ public class PurchaseOrderController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"purchase:order:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "订单ID不能为空！") String id) { - PurchaseOrderFullDto data = purchaseOrderService.getDetail(id); + PurchaseOrderFullDto data = purchaseOrderService.getDetail(id, false); if (data == null) { throw new DefaultClientException("订单不存在！"); } PrintPurchaseOrderBo result = new PrintPurchaseOrderBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo<>( - "print/purchase-order.ftl", result); - - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** @@ -132,13 +128,16 @@ public class PurchaseOrderController extends DefaultBaseController { * 根据ID查询 */ @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) + @ApiImplicitParams({ + @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true), + @ApiImplicitParam(value = "isForm", name = "是否为表单数据", paramType = "query", defaultValue = "false") + }) @HasPermission({"purchase:order:query"}) @GetMapping public InvokeResult findById( - @NotBlank(message = "订单ID不能为空！") String id) { + @NotBlank(message = "订单ID不能为空！") String id, Boolean isForm) { - PurchaseOrderFullDto data = purchaseOrderService.getDetail(id); + PurchaseOrderFullDto data = purchaseOrderService.getDetail(id, isForm); GetPurchaseOrderBo result = new GetPurchaseOrderBo(data); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseReturnController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseReturnController.java index 941f4ab9c0c942ae5c5a815d0aed5b23b33239d3..129169def06d58bd5715b0ab18cc6458acf10d02 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseReturnController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/PurchaseReturnController.java @@ -1,14 +1,13 @@ package com.lframework.xingyun.sc.controller.purchase; 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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.purchase.returned.GetPurchaseReturnBo; import com.lframework.xingyun.sc.bo.purchase.returned.PrintPurchaseReturnBo; import com.lframework.xingyun.sc.bo.purchase.returned.QueryPurchaseReturnBo; @@ -60,16 +59,14 @@ public class PurchaseReturnController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"purchase:return:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "退单ID不能为空！") String id) { PurchaseReturnFullDto data = purchaseReturnService.getDetail(id); PrintPurchaseReturnBo result = new PrintPurchaseReturnBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo<>( - "print/purchase-return.ftl", result); - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/ReceiveSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/ReceiveSheetController.java index d10fa631177357750f7a9e209b012e03daa6ddea..c71c03d541f065dba2f9a058482706e5430c8002 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/ReceiveSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/purchase/ReceiveSheetController.java @@ -2,15 +2,14 @@ package com.lframework.xingyun.sc.controller.purchase; 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.ExcelUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ExcelUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.purchase.receive.GetPaymentDateBo; import com.lframework.xingyun.sc.bo.purchase.receive.GetReceiveSheetBo; import com.lframework.xingyun.sc.bo.purchase.receive.PrintReceiveSheetBo; @@ -79,17 +78,14 @@ public class ReceiveSheetController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"purchase:receive:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "订单ID不能为空！") String id) { ReceiveSheetFullDto data = receiveSheetService.getDetail(id); PrintReceiveSheetBo result = new PrintReceiveSheetBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo( - "print/receive-sheet.ftl", result); - - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailConfigController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailConfigController.java index ffc231513d8f605b0a32d3a5a86463ec306a4c79..bc47e2a8db731cba67c32831a049ad211c6318a9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailConfigController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailConfigController.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.controller.retail; -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.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.sc.bo.retail.config.GetRetailConfigBo; import com.lframework.xingyun.sc.entity.RetailConfig; import com.lframework.xingyun.sc.service.retail.RetailConfigService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailOutSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailOutSheetController.java index 0f151eb3fa425603e28cd6ed82b6ed032d424ffe..a081c8a3ad0ddf448179fe710460f784b1953c59 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailOutSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailOutSheetController.java @@ -3,14 +3,13 @@ package com.lframework.xingyun.sc.controller.retail; 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.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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.purchase.receive.GetPaymentDateBo; import com.lframework.xingyun.sc.bo.retail.RetailProductBo; import com.lframework.xingyun.sc.bo.retail.out.GetRetailOutSheetBo; @@ -72,7 +71,7 @@ public class RetailOutSheetController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"retail:out:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "订单ID不能为空！") String id) { RetailOutSheetFullDto data = retailOutSheetService.getDetail(id); @@ -81,10 +80,8 @@ public class RetailOutSheetController extends DefaultBaseController { } PrintRetailOutSheetBo result = new PrintRetailOutSheetBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo<>( - "print/retail-out-sheet.ftl", result); - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailReturnController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailReturnController.java index ddd6d01e85f2776f21af632b0710a438d93f6589..89e97d81680efbcc5963f6e334ebedaf792d05e1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailReturnController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/retail/RetailReturnController.java @@ -2,14 +2,13 @@ package com.lframework.xingyun.sc.controller.retail; 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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.retail.returned.GetRetailReturnBo; import com.lframework.xingyun.sc.bo.retail.returned.PrintRetailReturnBo; import com.lframework.xingyun.sc.bo.retail.returned.QueryRetailReturnBo; @@ -61,7 +60,7 @@ public class RetailReturnController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"retail:return:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "退单ID不能为空！") String id) { RetailReturnFullDto data = retailReturnService.getDetail(id); @@ -71,10 +70,7 @@ public class RetailReturnController extends DefaultBaseController { PrintRetailReturnBo result = new PrintRetailReturnBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo<>( - "print/retail-return.ftl", result); - - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleConfigController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleConfigController.java index fad5cb0bd4092b2dc709299ef065d5c6228bbdac..973c79fc3b58aa8461654944eb35d6b71069c26a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleConfigController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleConfigController.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.controller.sale; -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.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.sc.bo.sale.config.GetSaleConfigBo; import com.lframework.xingyun.sc.entity.SaleConfig; import com.lframework.xingyun.sc.service.sale.SaleConfigService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOrderController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOrderController.java index d8c7c190e0e9801d6e559f78d091b6a48eb1b4cb..3a0ed493e92a012b4fc12c10116c04ad36e67222 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOrderController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOrderController.java @@ -3,14 +3,13 @@ package com.lframework.xingyun.sc.controller.sale; 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.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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.sale.GetSaleOrderBo; import com.lframework.xingyun.sc.bo.sale.PrintSaleOrderBo; import com.lframework.xingyun.sc.bo.sale.QuerySaleOrderBo; @@ -70,7 +69,7 @@ public class SaleOrderController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"sale:order:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "订单ID不能为空！") String id) { SaleOrderFullDto data = saleOrderService.getDetail(id); @@ -80,11 +79,7 @@ public class SaleOrderController extends DefaultBaseController { PrintSaleOrderBo result = new PrintSaleOrderBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo<>( - "print/sale-order.ftl", - result); - - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOutSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOutSheetController.java index 829f81663cd4168534bb05dc57411bb76f2a1c83..e0b9f14215eeeffc991cb4e1829b5b54554c4eb2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOutSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleOutSheetController.java @@ -2,14 +2,13 @@ package com.lframework.xingyun.sc.controller.sale; 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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.purchase.receive.GetPaymentDateBo; import com.lframework.xingyun.sc.bo.sale.out.GetSaleOutSheetBo; import com.lframework.xingyun.sc.bo.sale.out.PrintSaleOutSheetBo; @@ -67,7 +66,7 @@ public class SaleOutSheetController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"sale:out:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "订单ID不能为空！") String id) { SaleOutSheetFullDto data = saleOutSheetService.getDetail(id); @@ -77,10 +76,7 @@ public class SaleOutSheetController extends DefaultBaseController { PrintSaleOutSheetBo result = new PrintSaleOutSheetBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo<>( - "print/sale-out-sheet.ftl", result); - - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleReturnController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleReturnController.java index 9fc53e4c98ea7c150455e16ba0d827dfb3160191..760d1d074d111c95ff0eda2e0dc9c91cf5076505 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleReturnController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sale/SaleReturnController.java @@ -2,14 +2,13 @@ package com.lframework.xingyun.sc.controller.sale; 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.core.bo.print.A4ExcelPortraitPrintBo; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.sale.returned.GetSaleReturnBo; import com.lframework.xingyun.sc.bo.sale.returned.PrintSaleReturnBo; import com.lframework.xingyun.sc.bo.sale.returned.QuerySaleReturnBo; @@ -61,7 +60,7 @@ public class SaleReturnController extends DefaultBaseController { @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"sale:return:query"}) @GetMapping("/print") - public InvokeResult> print( + public InvokeResult print( @NotBlank(message = "退单ID不能为空！") String id) { SaleReturnFullDto data = saleReturnService.getDetail(id); @@ -72,10 +71,7 @@ public class SaleReturnController extends DefaultBaseController { PrintSaleReturnBo result = new PrintSaleReturnBo(data); - A4ExcelPortraitPrintBo printResult = new A4ExcelPortraitPrintBo( - "print/sale-return.ftl", result); - - return InvokeResultBuilder.success(printResult); + return InvokeResultBuilder.success(result); } /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockController.java index 2cfe076007224d82440c095e2e7362a326aaa055..f0faeb3eed0ac0c29fffa629014df89e18840404 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockController.java @@ -1,13 +1,13 @@ package com.lframework.xingyun.sc.controller.stock; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.product.QueryProductStockBo; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.excel.stock.ProductStockExportTaskWorker; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockLogController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockLogController.java index a045eea5b9587a705f2b976ea36db565c3ade714..476e0d691c969fd857344eba6a4423934bdc549e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockLogController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/ProductStockLogController.java @@ -1,13 +1,13 @@ package com.lframework.xingyun.sc.controller.stock; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.product.log.QueryProductStockLogBo; import com.lframework.xingyun.sc.entity.ProductStockLog; import com.lframework.xingyun.sc.excel.stock.ProductStockLogExportTaskWorker; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustReasonController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustReasonController.java index e315f5e5fc5bc2eeb1eb8cad543d19238eb8a3d8..76d7f292a3a920e7f4f9afbb9fcced9368d832ee 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustReasonController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustReasonController.java @@ -2,12 +2,12 @@ package com.lframework.xingyun.sc.controller.stock.adjust; 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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.sc.bo.stock.adjust.stock.reason.GetStockAdjustReasonBo; import com.lframework.xingyun.sc.bo.stock.adjust.stock.reason.QueryStockAdjustReasonBo; import com.lframework.xingyun.sc.entity.StockAdjustReason; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustSheetController.java index 14aba4c44b4991eef2dadbecdd448bd8499bf73a..ba1669f8aaea11caf112b889820ac15cba9869bb 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/adjust/StockAdjustSheetController.java @@ -3,13 +3,13 @@ package com.lframework.xingyun.sc.controller.stock.adjust; 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.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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.adjust.stock.QueryStockAdjustSheetBo; import com.lframework.xingyun.sc.bo.stock.adjust.stock.StockAdjustProductBo; import com.lframework.xingyun.sc.bo.stock.adjust.stock.StockAdjustSheetFullBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/PreTakeStockSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/PreTakeStockSheetController.java index ec51ce425d953855f8f4ae6413dcb580f541674d..45a7ea8ea7f209cc645fc91603aa666d234e29cf 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/PreTakeStockSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/PreTakeStockSheetController.java @@ -3,13 +3,13 @@ package com.lframework.xingyun.sc.controller.stock.take; 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.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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.take.pre.GetPreTakeStockSheetBo; import com.lframework.xingyun.sc.bo.stock.take.pre.PreTakeStockProductBo; import com.lframework.xingyun.sc.bo.stock.take.pre.QueryPreTakeStockSheetBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockConfigController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockConfigController.java index 81ba12beadd169cca2079587e8a1b7233bee39ab..ac3939c4f7a976681911a59058ec3f63f503ff84 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockConfigController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockConfigController.java @@ -1,10 +1,10 @@ package com.lframework.xingyun.sc.controller.stock.take; import com.lframework.starter.common.exceptions.impl.DefaultClientException; -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.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.sc.bo.stock.take.config.GetTakeStockConfigBo; import com.lframework.xingyun.sc.entity.TakeStockConfig; import com.lframework.xingyun.sc.service.stock.take.TakeStockConfigService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockPlanController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockPlanController.java index 0052027a4eb64e00d4a11d91c2e10f870b1f9645..4296beb66e4c780313c1e32eb88db322a3d9a1b4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockPlanController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockPlanController.java @@ -4,17 +4,17 @@ import com.lframework.starter.common.constants.StringPool; 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.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.threads.DefaultRunnable; -import com.lframework.starter.web.utils.CronUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.components.qrtz.QrtzHandler; -import com.lframework.xingyun.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.components.tenant.TenantContextHolder; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.threads.DefaultRunnable; +import com.lframework.starter.web.core.utils.CronUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.components.qrtz.QrtzHandler; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.take.plan.GetTakeStockPlanBo; import com.lframework.xingyun.sc.bo.stock.take.plan.QueryTakeStockPlanBo; import com.lframework.xingyun.sc.bo.stock.take.plan.QueryTakeStockPlanProductBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockSheetController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockSheetController.java index 077ceb59bbd4ac60f5a250e0237fbc4c8ec81c30..2a4d187a3494b4caec14b2c781c189b7aa3e64f4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockSheetController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/take/TakeStockSheetController.java @@ -3,13 +3,13 @@ package com.lframework.xingyun.sc.controller.stock.take; 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.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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.take.sheet.QueryTakeStockSheetBo; import com.lframework.xingyun.sc.bo.stock.take.sheet.TakeStockSheetFullBo; import com.lframework.xingyun.sc.bo.stock.take.sheet.TakeStockSheetProductBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/transfer/ScTransferOrderController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/transfer/ScTransferOrderController.java index 74faae307e25c2b72ff74210fd3b80708a753ff2..49a6a67bd7d1dd302269f6f23a3820b2acd5f3c2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/transfer/ScTransferOrderController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/transfer/ScTransferOrderController.java @@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.sc.bo.stock.transfer.QueryScTransferOrderBo; import com.lframework.xingyun.sc.bo.stock.transfer.QueryScTransferOrderDetailReceiveBo; import com.lframework.xingyun.sc.bo.stock.transfer.ScTransferOrderFullBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/warning/ProductStockWarningController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/warning/ProductStockWarningController.java index da8dd695f076e487f453d987fa8e00cca2dd2e13..b20deed39f4eff3a871b338790c1e8787322e479 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/warning/ProductStockWarningController.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/stock/warning/ProductStockWarningController.java @@ -3,12 +3,12 @@ package com.lframework.xingyun.sc.controller.stock.warning; 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.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.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.sc.bo.stock.warning.GetProductStockWarningBo; import com.lframework.xingyun.sc.bo.stock.warning.GetProductStockWarningNotifyBo; import com.lframework.xingyun.sc.bo.stock.warning.QueryProductStockWarningBo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetBizOrderDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetBizOrderDto.java index db750fc941294265271791ae74567d420645058d..e884df39aa3763d69b1edeecfaa0b0ae73a89cc7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetBizOrderDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetBizOrderDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.logistics; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetFullDto.java index 44cc19eb75ae2a7004014812925f633a24769a88..e417b1bcc30b61c77f4345084747a5da92d09fcf 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/logistics/LogisticsSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.logistics; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import com.lframework.xingyun.sc.enums.LogisticsSheetStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderFullDto.java index f7e1986e9ea21d93b35a76e70c43a9877c65dcf3..19e0cc1a81473ade1644df6817ea18c6c748acaf 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.PurchaseOrderStatus; import java.io.Serializable; import java.math.BigDecimal; @@ -104,6 +104,11 @@ public class PurchaseOrderFullDto implements BaseDto, Serializable { */ private String refuseReason; + /** + * 关联的审批流程ID + */ + private Long flowInstanceId; + /** * 订单明细 */ diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderWithReceiveDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderWithReceiveDto.java index a041cfff19754c7577b487d419e8d25165515285..5ef41795cd5432c329c6f6dc0735192491d5cebc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderWithReceiveDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseOrderWithReceiveDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java index 743a6c7bdd74b4bbc0fc2a92e5303dcb6b6d5b74..c6533c3d82fcafc56a358325234eecd1e04af716 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/GetPaymentDateDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/GetPaymentDateDto.java index 4cb36f6153644b7bd278ae5fe2c63ac065b6bc07..17a668ac8e1df3cc9afe6e3a4451ddab915cdd3a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/GetPaymentDateDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/GetPaymentDateDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase.receive; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.time.LocalDate; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetFullDto.java index 702a78121459ba3b9bd7ce09b9d4713b0b830ae8..b34d563c5f1fda53a9ba2224b5f82bf9191e88b2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase.receive; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.ReceiveSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetWithReturnDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetWithReturnDto.java index a73d1ef943e1dc85240a5c8a8ff8976be7ea993f..24482eb03cf8910b60717e5c741ce0460eb80a05 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetWithReturnDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/receive/ReceiveSheetWithReturnDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase.receive; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/returned/PurchaseReturnFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/returned/PurchaseReturnFullDto.java index fe1d0dc03ee87e684ad6ce1d7b18336d7b4fb5ee..8ebf76daf929f97618e24649d506b068bd830e09 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/returned/PurchaseReturnFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/returned/PurchaseReturnFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.purchase.returned; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.PurchaseReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java index a263d9dd1b72004941f4c712d07edbed6463415f..a59c6c9aa92e796ea768e7f09d29fec209a5f51c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.retail; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetDetailLotDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetDetailLotDto.java index aac392784826c4b15d352deb2eb6486b9ef37ef9..b5fb8374114af49dd0eb2887151ae631ea58e0b9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetDetailLotDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetDetailLotDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.retail.out; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetFullDto.java index 80da47bbc0cbb08bdad0d4c33aeaef174748a30f..5139289e0f82e0cb18d702e9788e500c44459629 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.retail.out; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.RetailOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetWithReturnDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetWithReturnDto.java index cf96f1b812c345ad323a5318f742c5f86f430ba3..e9a75eb6876d757558e49b5ebb85aa3e86ba9b9c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetWithReturnDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/out/RetailOutSheetWithReturnDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.retail.out; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/returned/RetailReturnFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/returned/RetailReturnFullDto.java index c37de0d22b11ec273d72f21ed1fcefe8b758b7fa..8e532d79f31cd217f7800c52fe3c73bf6a288270 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/returned/RetailReturnFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/returned/RetailReturnFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.retail.returned; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.RetailReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderFullDto.java index 69e5894d6f18851d5d49d3d8121a424eb2d776cd..09934af8d5fcc02015126fe76133da805432f96b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SaleOrderStatus; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderWithOutDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderWithOutDto.java index 71fc2b922ce90fa056a483ff7bd561e0d034ce0d..96e34ef375efbf5fdc0e63fbe506dd7ff01f8df5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderWithOutDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleOrderWithOutDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java index a61a4e0eb822a2d204a246cdcc2ac9763f7a4a24..c5d79a8a5f2bcbb6ff67a63acf6b01d9b4740d29 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetDetailLotDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetDetailLotDto.java index 95b411dca30c15c970f36f951c850ee1ff31fdb7..6df18026ed3b59c6426f2b6e14348d166c30883e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetDetailLotDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetDetailLotDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale.out; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetFullDto.java index 5580f24d67c289237aaa57a46f8b7390727ecc14..53ce64362c290d8299224d671efec2fb680560d3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale.out; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SaleOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetWithReturnDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetWithReturnDto.java index 3df6549e6c73014cd491699f7ab565c1c6118293..e4f3731d02699376e58aed501f8e68d8a0fcbe96 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetWithReturnDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/out/SaleOutSheetWithReturnDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale.out; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/returned/SaleReturnFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/returned/SaleReturnFullDto.java index fef795209eaac9df23336a80a389626a41506056..415b7688049ae0419857ed6d9bf2465aade6a2a4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/returned/SaleReturnFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/returned/SaleReturnFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.sale.returned; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SaleReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustProductDto.java index bbf372be23555426a09c4b85a3a42e17b98f8a1e..411f9a8e73156fd242a05d55fecbfeaf98303ca8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.adjust.stock; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustSheetFullDto.java index 28ff68e4efad41f5fd6f49092763e41baef643e8..c19363fa245a25ab4b674106e9724ab18636d783 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/stock/StockAdjustSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.adjust.stock; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.StockAdjustSheetBizType; import com.lframework.xingyun.sc.enums.StockAdjustSheetStatus; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/GetTakeStockPlanDetailProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/GetTakeStockPlanDetailProductDto.java index 5ca2ac224fef781f74f3be0a358abe7c7fc259d2..1d4b5a59c218f7dbc441a4fddd1c1ee01f9cff39 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/GetTakeStockPlanDetailProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/GetTakeStockPlanDetailProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.plan; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/QueryTakeStockPlanProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/QueryTakeStockPlanProductDto.java index 07836bd5a903ec481996d2e14eeabe303cb84657..589abba98712e62023a52a8bbb994d832eae6511 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/QueryTakeStockPlanProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/QueryTakeStockPlanProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.plan; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/TakeStockPlanFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/TakeStockPlanFullDto.java index 89d1a5042752fd77b0e2e96801bd02b367646980..3cdeb96920ef621db4ace452694be9f0fb946b97 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/TakeStockPlanFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/plan/TakeStockPlanFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.plan; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.TakeStockPlanStatus; import com.lframework.xingyun.sc.enums.TakeStockPlanType; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockProductDto.java index d003cf9296bf3f8af111abff7b8583c0e2c257f4..1aa5722fe945414fe746d8f8e2bb6e6021f02c83 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.pre; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockSheetFullDto.java index 70ce79cc99708c42fcbaa362afc9da9b2e5afce9..34e8eb0a1cc1714f364e920db7decb3d381bc073 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/PreTakeStockSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.pre; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.PreTakeStockSheetStatus; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/QueryPreTakeStockSheetProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/QueryPreTakeStockSheetProductDto.java index 84e82ef870d84bab124fa8de3789c5d2f07ffaba..2b00ec0391d0dbf933d228e9166010a6f4af4a15 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/QueryPreTakeStockSheetProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/pre/QueryPreTakeStockSheetProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.pre; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.PreTakeStockSheetStatus; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetFullDto.java index b13f19767898961b8585e41a300b39fd3731c4af..8be6db5d32b914ec9e8dcd7a0e661bbd3e68493f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.sheet; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.TakeStockSheetStatus; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetProductDto.java index c6a8c2ff1e4a6461d7c14420615783bc63e4ee9f..a4beda4a759f8f03cc91c346fcb6383dafd8880d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/take/sheet/TakeStockSheetProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.take.sheet; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferOrderFullDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferOrderFullDto.java index 877783b7ca67bff6b4a96c54259cfbf33e904d54..1441ca498cc14332acb02cea7323fce85b050d2d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferOrderFullDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferOrderFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.transfer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.ScTransferOrderStatus; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferProductDto.java index dfb00df6a9d6c94e20639d79b1c4ab7de80f03ec..550f9596c8c231f819405bac2be8cccf226a720a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/transfer/ScTransferProductDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.dto.stock.transfer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheet.java index 8749af12f5e76a6dcaf9bba9e18626f83316d3e4..08e0a9df46c078dbbdfb6fa05c6b4275c4653fa9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.LogisticsSheetStatus; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheetDetail.java index 7071ac368329385c6da05084fc6bcb8d14276877..e042296c0301a9a070ded3101818d7724ddb78b7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/LogisticsSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/OrderPayType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/OrderPayType.java index f87626fc8196046eff09014b26776e12107a0c25..9a957921cc633ae96d7dadc8d4ba2e0c2103000c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/OrderPayType.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/OrderPayType.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheet.java index c4c506cc4421b60039e9e11903bfccb597d40eec..459fefde44bf3ebe58ea393bcc33d897adfb5fea 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.PreTakeStockSheetStatus; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheetDetail.java index 687d84fac93120dc35ed38684d9c72ca720e6156..a7e7c18df22ed7720bf4f6016f014be138d2796c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PreTakeStockSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStock.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStock.java index f9090fe4fe73ef6bd82e0693e685d88e6076d5f4..7a7451518ede8ba4eca5f9902c1eca85e1b75f2a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStock.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStock.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockLog.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockLog.java index a85f0465a748b7915647af41715137bf9c1dd2be..36fd3ed4336c2bc606466c9e0fef087f9bc4f0e6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockLog.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockLog.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.ProductStockBizType; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarning.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarning.java index 4414dfe794a7f298e8a6f360aba18c510112efb7..13aa53787630301453fc55f2e60017bb78127eaa 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarning.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarning.java @@ -3,9 +3,8 @@ package com.lframework.xingyun.sc.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.math.BigDecimal; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarningNotify.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarningNotify.java index 16fd3d30a0dbd11ca9a5495db91571bc7da531f7..97c6017fa04f9a680787c3e469081d4d26447eea 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarningNotify.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductStockWarningNotify.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseConfig.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseConfig.java index 9e0ee9325131f41a03939c8abd2cd035ef17cf47..58277c6820d19ae4be858c98d29b921c3ccbb6c8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseConfig.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseConfig.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** @@ -43,4 +43,19 @@ public class PurchaseConfig extends BaseEntity implements BaseDto { * 采购退货单是否多次关联采购收货单 */ private Boolean purchaseReturnMultipleRelateReceive; + + /** + * 采购订单是否开启审批流程 + */ + private Boolean purchaseRequireBpm; + + /** + * 采购订单关联的审批流程ID + */ + private Long purchaseBpmProcessId; + + /** + * 采购订单关联的审批流程编号 + */ + private String purchaseBpmProcessCode; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrder.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrder.java index 4a26855cb748fb355ab1c745cbccb028bdf1b3c6..115be350301dacfa9b46d6640f9f496611c77575 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrder.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrder.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.PurchaseOrderStatus; import java.math.BigDecimal; import java.time.LocalDate; @@ -28,106 +28,111 @@ public class PurchaseOrder extends BaseEntity implements BaseDto { /** * ID */ - private String id; + protected String id; /** * 单号 */ - private String code; + protected String code; /** * 仓库ID */ - private String scId; + protected String scId; /** * 供应商ID */ - private String supplierId; + protected String supplierId; /** * 采购员ID */ - private String purchaserId; + protected String purchaserId; /** * 预计到货日期 */ - private LocalDate expectArriveDate; + protected LocalDate expectArriveDate; /** * 采购数量 */ - private Integer totalNum; + protected Integer totalNum; /** * 赠品数量 */ - private Integer totalGiftNum; + protected Integer totalGiftNum; /** * 采购金额 */ - private BigDecimal totalAmount; + protected BigDecimal totalAmount; /** * 备注 */ - private String description; + protected String description; /** * 创建人ID 新增时赋值 */ @TableField(fill = FieldFill.INSERT) - private String createById; + protected String createById; /** * 创建人 新增时赋值 */ @TableField(fill = FieldFill.INSERT) - private String createBy; + protected String createBy; /** * 创建时间 新增时赋值 */ @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; + protected LocalDateTime createTime; /** * 修改人 新增和修改时赋值 */ @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateBy; + protected String updateBy; /** * 修改人ID 新增和修改时赋值 */ @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateById; + protected String updateById; /** * 修改时间 新增和修改时赋值 */ @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime updateTime; + protected LocalDateTime updateTime; /** * 审核人 */ - private String approveBy; + protected String approveBy; /** * 审核时间 */ - private LocalDateTime approveTime; + protected LocalDateTime approveTime; /** * 状态 */ - private PurchaseOrderStatus status; + protected PurchaseOrderStatus status; /** * 拒绝原因 */ - private String refuseReason; + protected String refuseReason; + + /** + * 关联的审批流程ID + */ + private Long flowInstanceId; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetail.java index 0155721b8a97fc3e0190a1238d2463298e7abe7a..dbd4dcf25c162ae83072af374d382f566b092333 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; @@ -23,50 +23,50 @@ public class PurchaseOrderDetail extends BaseEntity implements BaseDto { /** * ID */ - private String id; + protected String id; /** * 订单ID */ - private String orderId; + protected String orderId; /** * 商品ID */ - private String productId; + protected String productId; /** * 采购数量 */ - private Integer orderNum; + protected Integer orderNum; /** * 采购价 */ - private BigDecimal taxPrice; + protected BigDecimal taxPrice; /** * 是否赠品 */ - private Boolean isGift; + protected Boolean isGift; /** * 税率（%） */ - private BigDecimal taxRate; + protected BigDecimal taxRate; /** * 备注 */ - private String description; + protected String description; /** * 排序编号 */ - private Integer orderNo; + protected Integer orderNo; /** * 已收货数量 */ - private Integer receiveNum; + protected Integer receiveNum; } diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetailForm.java similarity index 30% rename from xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java rename to xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetailForm.java index 29a6b26ce09d4f09e5c1eefb36d42ce9d268215b..483afe0ad80557b91208a7ea5e3e8aab53bea01a 100644 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderDetailForm.java @@ -1,8 +1,9 @@ -package com.lframework.xingyun.template.inner.entity; +package com.lframework.xingyun.sc.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.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; +import java.math.BigDecimal; import lombok.Data; /** @@ -11,26 +12,12 @@ import lombok.Data; *

* * @author zmj - * @since 2021-07-04 + * @since 2021-09-12 */ @Data -@TableName("sys_user_role") -public class SysUserRole extends BaseEntity implements BaseDto { +@TableName("tbl_purchase_order_detail_form") +public class PurchaseOrderDetailForm extends PurchaseOrderDetail implements BaseDto { private static final long serialVersionUID = 1L; - /** - * ID - */ - private String id; - - /** - * 用户ID - */ - private String userId; - - /** - * 角色ID - */ - private String roleId; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderForm.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderForm.java new file mode 100644 index 0000000000000000000000000000000000000000..f2593c5adb82bcc04e847ea3e47a228f0f60f20f --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderForm.java @@ -0,0 +1,20 @@ +package com.lframework.xingyun.sc.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.lframework.starter.web.core.dto.BaseDto; +import lombok.Data; + +/** + *

+ * + *

+ * + * @author zmj + * @since 2021-09-12 + */ +@Data +@TableName("tbl_purchase_order_form") +public class PurchaseOrderForm extends PurchaseOrder implements BaseDto { + + private static final long serialVersionUID = 1L; +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturn.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturn.java index f0086cfb1e730d8dd217ab01b89ba7a9d6bfe206..fb73ce588cf11d22436f78d8204131ad881143aa 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturn.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturn.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.PurchaseReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturnDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturnDetail.java index c76d8f650479d7358995707b71868d0562e52977..ec37c0f8e140399077fee4326b84391b2ef14d72 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturnDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseReturnDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheet.java index 5b2012f3dbcd5872901adf53f31e84d882bf01d0..2d73d0a8be516011c56499d7c4cbd1bb50c4f186 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.ReceiveSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheetDetail.java index 21c4c5579a58e06a11247b64904d3aab47f5b8a3..f23a1bdc3f6ea28c0beb871c511e2a597924577b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ReceiveSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailConfig.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailConfig.java index fb254576d991242af2cc20281e5bf4b9a6463e6a..b5447f27e07e45e71bfbb1a36050dad77fc51f47 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailConfig.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailConfig.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheet.java index 25aac1f5ed003de0990ed41c5c2b0a86a3b4ec74..712153263137551bb545618d661c747e40ed06f1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.RetailOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetail.java index 54eabcd17f7b1da5545685e1b5c6a794ebb15d2a..d04afee2c286f6a3c437f6bc02d9e5761dcf6d06 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailBundle.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailBundle.java index 2182b2a439322e23bd20b66290fa1d0a84b8272d..60b97b3f79cf7a55c8ad517eb1da4eca52609f4d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailBundle.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailBundle.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailLot.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailLot.java index 1f4c535adb2c753a33dd6818c03d837b46666af0..c81a7279d4b0b0a68271508172649b4679bee3dc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailLot.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailOutSheetDetailLot.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturn.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturn.java index 14a18d9fa43c27c3f1bb028376da2f2075cc85ee..b542dae6dc46e29d7499a02d98ea710dc48218ad 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturn.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturn.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.RetailReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturnDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturnDetail.java index c3e875dd80cf9cb4c5952f6ae0295e1c0164fd08..cb5c0b932e83042c2936a5cc6cf66b2fcff65bd6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturnDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/RetailReturnDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleConfig.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleConfig.java index cd62683a7645b18d2db51a91f683ca47143a3f9c..3a4bed8222b39938318195ec4110535ffa2e0682 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleConfig.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleConfig.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrder.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrder.java index 2e0a2326fc1c8be0f40a5e52aad1a998ac52c9e1..5a0474735508041fdf3970bf411e7184410fb9b9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrder.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrder.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SaleOrderStatus; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetail.java index 84209fe1746cb09e527d48d2b97491b76a4b81cb..f887d8f70c3151178b974d76729f569d026a110a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetailBundle.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetailBundle.java index 7fe1f7f8d320e6d96f613ef5e31d8433c14fee0c..17cc5a1a7a85371543e5aa0f60a592436a05e92a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetailBundle.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOrderDetailBundle.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheet.java index 7d8c73c2585214af22cf8fd6572b0c2ca3cb21a1..a33e4136bbacd180464d31d57deacf9c4b19aeb4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SaleOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetail.java index 4cd348e818ec5e7b6572b8804086f7120b330eff..b336c7fa72fcf9cd529d0be51c65c9c13d2276e0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailBundle.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailBundle.java index ffd3da3bb71dba79f75e72ea0383c6410c278040..63b677622a0e32e4656872dd594667529d57dd2f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailBundle.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailBundle.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailLot.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailLot.java index 98428aab74a6ea0989a5e853fd663eb642424eba..e46b39f949734cad283f82d4454c446fa0bc074c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailLot.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleOutSheetDetailLot.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturn.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturn.java index a6024e9e3e8f087000e50a39146601ebc557e08b..5a4dc63d98b624f4796c1e70242314a5472dd5f9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturn.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturn.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SaleReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturnDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturnDetail.java index 733aac4d5e4340eb0a1960568075cbc3ee98eb5b..d36e72b8827a8bca5309fd1ee2d8b6fbd92d5921 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturnDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/SaleReturnDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.SettleStatus; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrder.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrder.java index 3f05317081318ebf896524b22a227308baf48ff1..ed1abfcd213fdbd15740c332307a25c761b4441d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrder.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrder.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.ScTransferOrderStatus; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetail.java index fb162fa02d405635362051a57d1b6b1eec0cf93f..bf07c14de2e505fa236cb3846319b4ff2a13181a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetailReceive.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetailReceive.java index 5b27dc3b529451afccef4242be28be21f5af47bd..cc5bc70ea9d7ca8d96a5df7542e7e41625f2034d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetailReceive.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ScTransferOrderDetailReceive.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustReason.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustReason.java index be0aa616aa75bc41e6ebdc8cf7a26728c1d1cb04..11c9e5bf9a2393420caac8f09aff55f6585a036b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustReason.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustReason.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheet.java index 0b894e861e66e2a0e01e1ebe898a724f8e967504..52672784edabba60bbb5f2eb031288b1b4103377 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.StockAdjustSheetBizType; import com.lframework.xingyun.sc.enums.StockAdjustSheetStatus; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheetDetail.java index c0b6b544df9b66d9b7a760de63f34e33712e1828..4b3103694ff7e65b6e45ed93673b526c3dbb142d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/StockAdjustSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockConfig.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockConfig.java index e5d63c47b3b1918665e9abf6f8d09a9fa393aab5..ad23cbf09046daa33cda4821b43a8e01f2934ec1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockConfig.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockConfig.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlan.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlan.java index e7984910057bb97c0bbc46757fda44f91b1db342..e5fe59d9ee1a5d01c2ac98186c9877c74361515f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlan.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlan.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.TakeStockPlanStatus; import com.lframework.xingyun.sc.enums.TakeStockPlanType; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlanDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlanDetail.java index 19c986439b082cde116a772e6d2080a7662ef6ba..00b087e11ba2124f53b7ec704114d37781008f12 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlanDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockPlanDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheet.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheet.java index afb34ef75f948372b372a04dfab90585ca67ef30..38611ecd91a24d6117d476fd05924e98da4eaa4b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheet.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.sc.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.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import com.lframework.xingyun.sc.enums.TakeStockSheetStatus; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheetDetail.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheetDetail.java index 0fa12c488da8bde664dccc26d8899e88f00bae26..2852473011c7934edb7b6f2c0933d5ca994543dc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheetDetail.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/TakeStockSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; +import com.lframework.starter.web.core.entity.BaseEntity; import lombok.Data; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..f732e90fc66691c1882a4b0857e78239fd8a9d86 --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class LogisticsOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2000; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetDetailBizType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetDetailBizType.java index d7398c48ad7ec9bfda7ce60c3d14f78e47ac8aba..9490d001cde0b23ca3b15c1c3b6bc4053bca5b21 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetDetailBizType.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetDetailBizType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum LogisticsSheetDetailBizType implements BaseEnum { SALE_OUT_SHEET(1, "销售出库单"), RETAIL_OUT_SHEET(2, "零售出库单"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetStatus.java index bee571e60f0ba81003d0da58d72bdd9ef40bcdb5..d44e578849d85b0d83c895c433b4e4c9c02d00d2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/LogisticsSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum LogisticsSheetStatus implements BaseEnum { CREATED(0, "待发货"), DELIVERY(3, "已发货"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/OrderAddressOrderType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/OrderAddressOrderType.java index 30e743a546944c333493c3965bb264773bb4456c..4f401ae8ede3ac0a905da51fb1a40dcc00656abd 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/OrderAddressOrderType.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/OrderAddressOrderType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum OrderAddressOrderType implements BaseEnum { PURCHASE_ORDER(0, "采购订单"), RECEIVE_SHEET(1, "采购收货单"), PURCHASE_RETURN(2, "采购退单"), diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PreTakeStockSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PreTakeStockSheetStatus.java index 83f68a5d8408c14a26b3f76cd9101b38368a4313..72af33ae928b133e2c9e69e5d7cef6672f630a6d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PreTakeStockSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PreTakeStockSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum PreTakeStockSheetStatus implements BaseEnum { FIRST_TAKE(0, "初盘"), SECOND_TAKE(1, "复盘"), RAND_TAKE(2, "抽盘"), diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ProductStockBizType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ProductStockBizType.java index 8d309b2480cfaa7cd557545763a5382e9cecc90d..12259d030608692d6792161c134b9d060e3e86fb 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ProductStockBizType.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ProductStockBizType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ProductStockBizType implements BaseEnum { PURCHASE(1, "采购入库"), PURCHASE_RETURN(2, "采购退货出库"), SALE(3, "销售出库"), SALE_RETURN(4, diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..1a7c33b6045e6635462e8e773cf8487285461bbf --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class PurchaseOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2001; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOrderStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOrderStatus.java index 4fa0a3de3c7b603e9ec85cef33f2042a8b3c3e95..10071de31610fc958290004e78fc52faf7401bfa 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOrderStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseOrderStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum PurchaseOrderStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseReturnStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseReturnStatus.java index dcf6846c24a7c82a967180e18eeee4021f6851f9..5df4f5a2da457dd8bbc95894534fe5d25647b851 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseReturnStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/PurchaseReturnStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum PurchaseReturnStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ReceiveSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ReceiveSheetStatus.java index 8719d76aa686de1efc9296aa79bf90ecb6551d88..67dfa9ed33ea474bebd765454954913c0ad3bf77 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ReceiveSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ReceiveSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ReceiveSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..65a1745bf159a143ed356722c5c4875cca2d1b59 --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class RetailOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2002; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOutSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOutSheetStatus.java index 21edb08e7ddfcc45687c13a35645edbfdd126f9d..fc5f085cb9e40d11ae96c95713ec22e3b88ede49 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOutSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailOutSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum RetailOutSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailReturnStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailReturnStatus.java index b46a453e4bc3ed96d3001bbf7b1977a2b4b6be5a..1f27fef3ddbe14c7e351f633c3f1e1d2350ba473 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailReturnStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/RetailReturnStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum RetailReturnStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..1628c5ffe11ff4d782817edbf0b1faab16be1f3a --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class SaleOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2003; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOrderStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOrderStatus.java index 68ab2d9530625295046d5041a9b300e8fe4e0a14..e26f2a56875a0ba5240289efd7d7ba426d3c7efe 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOrderStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOrderStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SaleOrderStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOutSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOutSheetStatus.java index 794a8b31eb9dbc810310255c5d05bf5c58ebafe9..0ad804ed165c2003e77f826f8d25f918b9821074 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOutSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleOutSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SaleOutSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleReturnStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleReturnStatus.java index ce8d1c0d11eb00b14de3877cfd85dc5ea6ce3796..93b5b81bcc7aa39abcb4050407fb994ae81a4e56 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleReturnStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SaleReturnStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SaleReturnStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScOpLogType.java deleted file mode 100644 index 943f434f08c0966de608b52438f8ad244a30ba56..0000000000000000000000000000000000000000 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScOpLogType.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.sc.enums; - -public interface ScOpLogType { - - // 物流单管理 - int LOGISTICS = 2000; - - // 采购业务 - int PURCHASE = 2001; - - // 零售业务 - int RETAIL = 2002; - - // 销售业务 - int SALE = 2003; - - // 库存调整 - int STOCK_ADJUST = 2004; - - // 仓库调拨 - int SC_TRANSFER = 2005; - - // 库存盘点 - int TAKE_STOCK = 2006; - - // 库存预警 - int STOCK_WARNING = 2007; - -} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..8e6d394246286c03758869bbae6fab4fd100feb0 --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class ScTransferOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2005; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOrderStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOrderStatus.java index ca573d5f3037ef2ea9c675d9b76dedbaeb38efcd..c2f7da923f901f54c26ac655b0bc49c30deb155f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOrderStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/ScTransferOrderStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum ScTransferOrderStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"), PART_RECEIVED(9, "部分收货"), RECEIVED(12, "已收货"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SettleStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SettleStatus.java index cd6ce646fbbdc5ff91434ca66dc581a7b4ed7b7d..8f33f0827a2f1db2a6d97fc07e3c2e018604ae2d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SettleStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/SettleStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleStatus implements BaseEnum { UN_SETTLE(0, "未结算"), PART_SETTLE(1, "结算中"), SETTLED(3, "已结算"), UN_REQUIRE(6, "无需结算"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..a606f71103148a0659d0f65ca4fafe0a2b4de9b8 --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class StockAdjustOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2004; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetBizType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetBizType.java index 5bdd76ba9a79110f6c3dbcc258b3abdb2656bb0b..aec35e065817c73df9a9037dced17eade34b1d62 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetBizType.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetBizType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum StockAdjustSheetBizType implements BaseEnum { IN(0, "入库"), OUT(2, "出库"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetStatus.java index 150d2de2bbfaec867be49ebb07a9cfc5aae96c8f..8234e3dc1b030b1bea4e1bd39f9e30b035a6f85f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockAdjustSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum StockAdjustSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockWarningOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockWarningOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..4dcb7218573714d1d0589c40ee93bca2322740cf --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockWarningOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class StockWarningOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2007; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockOpLogType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockOpLogType.java new file mode 100644 index 0000000000000000000000000000000000000000..9261e16d440264e4c6584a25e3b30ee29c93c02b --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockOpLogType.java @@ -0,0 +1,13 @@ +package com.lframework.xingyun.sc.enums; + +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; + +@Component +public class TakeStockOpLogType implements OpLogType { + + @Override + public Integer getCode() { + return 2006; + } +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanStatus.java index 9a0edd86ce23b3d1c736581ccbd3ea5f325cf074..54eba6d85d8bfa4735aacf464eca383b00f44d55 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum TakeStockPlanStatus implements BaseEnum { CREATED(0, "盘点任务生成"), DIFF_CREATED(6, "盘点差异生成"), FINISHED(9, "盘点完成"), CANCELED(12, "盘点已作废"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanType.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanType.java index f11ce6cec431c56a32ef6ab06be7a52a3ca46e77..9d4f88760c59b9cd5da856d9562879ef08b41dbe 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanType.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockPlanType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum TakeStockPlanType implements BaseEnum { ALL(0, "全场盘点"), SIMPLE(1, "单品盘点"), CATEGORY(2, "分类盘点"), BRAND(3, "品牌盘点"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockSheetStatus.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockSheetStatus.java index 7b962ad5c76678bcfd7f971a03a2344b73da40ee..49064bdd6e2ae4f52213a10ee45f9061669663b5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockSheetStatus.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/TakeStockSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum TakeStockSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/ApprovePassOrderEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/ApprovePassOrderEvent.java index a21ab33c49ef373a0a1fedf7f9374756d22d41cd..31315c9617e748520a13d72ad1df37a4aa523a5b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/ApprovePassOrderEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/ApprovePassOrderEvent.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.events.order; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseOrderEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseOrderEvent.java index 8db7736280e1146dfaeb9104a021cd875ef471ce..7f875e4c37efeb0021519022271d55f511c2b73b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseOrderEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseOrderEvent.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.events.order.impl; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto.OrderType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto.OrderType; import com.lframework.xingyun.sc.events.order.ApprovePassOrderEvent; public class ApprovePassPurchaseOrderEvent extends ApprovePassOrderEvent { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseReturnEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseReturnEvent.java index 8846e2db9e920ff9f3981464156cebc2a410e91b..80237971d825b7b2abee231c63a76e3eb44bd718 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseReturnEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassPurchaseReturnEvent.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.events.order.impl; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto.OrderType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto.OrderType; import com.lframework.xingyun.sc.events.order.ApprovePassOrderEvent; public class ApprovePassPurchaseReturnEvent extends ApprovePassOrderEvent { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailOutSheetEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailOutSheetEvent.java index d8882cee1dfad976e99f80926b06293b8800264e..88440a15a190c8df2a18b62d0a63c17dd8bb65d2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailOutSheetEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailOutSheetEvent.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.events.order.impl; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto.OrderType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto.OrderType; import com.lframework.xingyun.sc.events.order.ApprovePassOrderEvent; public class ApprovePassRetailOutSheetEvent extends ApprovePassOrderEvent { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailReturnEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailReturnEvent.java index b003d845d4d58256cf6b71069c093c669d069478..895a7a1a9670d1845ec6c9c0d5372e706391c447 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailReturnEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassRetailReturnEvent.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.events.order.impl; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto.OrderType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto.OrderType; import com.lframework.xingyun.sc.events.order.ApprovePassOrderEvent; public class ApprovePassRetailReturnEvent extends ApprovePassOrderEvent { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleOrderEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleOrderEvent.java index fa3ad9329da8bb5e122307fcd835f901ff64a7ed..9f22c9f672675c502db64f26da923651b6c256bc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleOrderEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleOrderEvent.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.events.order.impl; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto.OrderType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto.OrderType; import com.lframework.xingyun.sc.events.order.ApprovePassOrderEvent; public class ApprovePassSaleOrderEvent extends ApprovePassOrderEvent { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleReturnEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleReturnEvent.java index e1cddf8a9eed536d69ff21ac00c376a12e813641..fd6c36a1862d600381f56a44623528231faee40b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleReturnEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/order/impl/ApprovePassSaleReturnEvent.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.events.order.impl; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto.OrderType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto.OrderType; import com.lframework.xingyun.sc.events.order.ApprovePassOrderEvent; public class ApprovePassSaleReturnEvent extends ApprovePassOrderEvent { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/AddStockEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/AddStockEvent.java index 5369b322e46670c83d10f208bd650029e09ac669..f699021c664e3654177f17300a5f0f22e3d36ada 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/AddStockEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/AddStockEvent.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.events.stock; -import com.lframework.xingyun.core.dto.stock.ProductStockChangeDto; +import com.lframework.starter.web.inner.dto.stock.ProductStockChangeDto; import org.springframework.context.ApplicationEvent; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/SubStockEvent.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/SubStockEvent.java index 456ac73b71fd6223ce0bff87e494d7d18e4514d9..94c2da5354bfa515d4e5d6f7b4fe232c25533b01 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/SubStockEvent.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/events/stock/SubStockEvent.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.events.stock; -import com.lframework.xingyun.core.dto.stock.ProductStockChangeDto; +import com.lframework.starter.web.inner.dto.stock.ProductStockChangeDto; import org.springframework.context.ApplicationEvent; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportListener.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportListener.java index 59673e3bcd778f35643e59f4322019a89a39734e..6b9163c602f1a35f895a7031d2dc8a478c0ab262 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportListener.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportListener.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; import com.lframework.xingyun.sc.entity.LogisticsSheet; import com.lframework.xingyun.sc.service.logistics.LogisticsSheetService; import com.lframework.xingyun.sc.vo.logistics.DeliveryLogisticsSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportModel.java index 366ae8aba0149bc80796906d78b9bd04d36d6d6d..997165a32316819d7efa2846d7a0f2f03a2ecba8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetDeliveryImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.excel.logistics; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportModel.java index 555189496713cf13cc64781311fccaf4cf1c7454..35a8ccbae3593a9f4ca8ba3cb930f30972b1ded7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportModel.java @@ -2,16 +2,16 @@ package com.lframework.xingyun.sc.excel.logistics; import com.alibaba.excel.annotation.ExcelProperty; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import com.lframework.xingyun.basedata.service.logistics.LogisticsCompanyService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.DicCityService; import com.lframework.xingyun.sc.entity.LogisticsSheet; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportTaskWorker.java index 26378458d3482b389d8822e5f53f12f6249dea4c..dce4ec7dc0ad0a7992a4b12efe22c35f4fbc1e57 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.logistics; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.LogisticsSheet; import com.lframework.xingyun.sc.service.logistics.LogisticsSheetService; import com.lframework.xingyun.sc.vo.logistics.QueryLogisticsSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportListener.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportListener.java index 3de6e555f68969453d2d13f3c2b6973e60d8abcd..e9c8883354ce4069a2fe054e870e31c766e55d21 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportListener.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportListener.java @@ -8,12 +8,12 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import com.lframework.xingyun.basedata.service.logistics.LogisticsCompanyService; -import com.lframework.xingyun.core.dto.dic.city.DicCityDto; -import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.starter.web.inner.dto.dic.city.DicCityDto; +import com.lframework.starter.web.inner.service.DicCityService; import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportModel.java index 8535870d15bd700e4641a6111d7dca909f63a83b..663e459b792f938e0e9cf4214f393f7af7b63b5a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/logistics/LogisticsSheetImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.excel.logistics; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import java.util.Map; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportModel.java index 7209cb414e1494afd3de6553c2a5795026a0efa2..4c1c7a1daccf5f04dbd8d579422a3b3ffbbdfda3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportModel.java @@ -6,20 +6,20 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.entity.PurchaseOrder; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportTaskWorker.java index 839e92ec5915691ae0912057e443b4221a0317c6..7cb829530e405cc3cbce366bec6f4694d8e1bb30 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.purchase; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.PurchaseOrder; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseOrderVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportListener.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportListener.java index 1c54e1f0530f1595b941b7c95ec30aaedd38eb55..e14a7c6564d07f93df19a6c2f1402276b7c78b7a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportListener.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportListener.java @@ -7,19 +7,19 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.vo.purchase.CreatePurchaseOrderVo; import com.lframework.xingyun.sc.vo.purchase.PurchaseProductVo; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportModel.java index 164a91c5ddf4bcad37d9b94b11f64e6c2c06d11a..a01584ad4d45d805c967b9a02a41702375c37b25 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.excel.purchase; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportListener.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportListener.java index aeca509e646303cbee3e01a50d5fb56a771d86da..af19bf3523c747846362cef5e7cf6d97df92ea34 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportListener.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportListener.java @@ -7,8 +7,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; 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.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.sc.entity.OrderPayType; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportModel.java index 1025beb05381bb7703dee31b5f03d3713792a88c..78e63ba1ab49d0b2820ba80fbe1de0e96579ee63 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/PurchaseOrderPayTypeImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.excel.purchase; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportModel.java index d7f23b63a45173798c220483ab4226d87a7ce090..ae8c009a18c3611e7a1054d173cb919adf44b803 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportModel.java @@ -5,18 +5,18 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.PurchaseOrder; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportTaskWorker.java index 56e4bda762390463831a29d43f564721949069df..73ab61f4ae1c6e576e179d9d7ad4c08799fd008d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.purchase.receive; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService; import com.lframework.xingyun.sc.vo.purchase.receive.QueryReceiveSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportListener.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportListener.java index e445fdb2091adb27b57945bb5311fea7b728929e..f1498e7c7f2b14096733d1891c3ea348b26b059c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportListener.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportListener.java @@ -7,19 +7,19 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService; import com.lframework.xingyun.sc.vo.purchase.receive.CreateReceiveSheetVo; import com.lframework.xingyun.sc.vo.purchase.receive.ReceiveProductVo; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportModel.java index 0da26099dd0bae61b9eeb398608b2a3c33c5f25f..b63a8e22b99ba143eb406d49540a109b13d66d3b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.excel.purchase.receive; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportListener.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportListener.java index 96bd28568dce787cd7eee66b082524af333d1fe0..fa3bbc0bdf7aa4d572ad69821ae8be4e4f994c43 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportListener.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportListener.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelImportListener; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelImportListener; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.sc.entity.ReceiveSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportModel.java index 12b22aa0d01b2288fcc483a112b72614dc2fcffd..3a4d9a8bf8147a3bb7b3f5aef10fe3599f291652 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/receive/ReceiveSheetPayTypeImportModel.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.excel.purchase.receive; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.annotations.excel.ExcelRequired; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.annotations.excel.ExcelRequired; +import com.lframework.starter.web.core.components.excel.ExcelModel; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportModel.java index 44fe60fb2b9a78f7dbeacf50c37498d30bfcbb4f..ca66497eeef194d989e5236221806c59f450c7bc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportModel.java @@ -5,18 +5,18 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportTaskWorker.java index f1d3416270dfb15be48af5e6290aef7f638585f4..31866ed1fcc4067479ecbaf74084edf4ac0cc75e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/purchase/returned/PurchaseReturnExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.purchase.returned; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.service.purchase.PurchaseReturnService; import com.lframework.xingyun.sc.vo.purchase.returned.QueryPurchaseReturnVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportModel.java index b4dcb81d1b4f4ce0c92381360df4f635b411ebda..d3101589eb23a9764a0fbc7f82073d8fdbf5d925 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportModel.java @@ -6,20 +6,20 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportTaskWorker.java index c82531573eb9f4c7fcd2749bc92f2d60fe0e4112..4db95f52ce8eb7a432ce58d71e7bbde3a61cc525 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/out/RetailOutSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.retail.out; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; import com.lframework.xingyun.sc.vo.retail.out.QueryRetailOutSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportModel.java index efd2763f08e4aa26c72aeeff63bf444246b4e3d3..5a7be57c118e3943c176dda0268e991e1eec4412 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportModel.java @@ -6,22 +6,22 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.entity.RetailOutSheet; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.retail.RetailOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportTaskWorker.java index 931221d24f9f826c50a03bace32198fd42b9d7db..bbe1ac79008c8478d589a1672b4b8b8d52260165 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/retail/returned/RetailReturnExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.retail.returned; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.service.retail.RetailReturnService; import com.lframework.xingyun.sc.vo.retail.returned.QueryRetailReturnVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportModel.java index 6132f295b0a0101226cc1a53e058fd830113e58f..5bfbd81fe1fb42b4c9692eebeb10112610a9f894 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportModel.java @@ -6,20 +6,20 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.paytype.PayTypeService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.entity.SaleOrder; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportTaskWorker.java index ede24fabdea2b4629020fd1fdfc8c140b8d90c9c..64e505ec022ada0d61bba458874e59c2959df2a9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/SaleOrderExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.sale; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.SaleOrder; import com.lframework.xingyun.sc.service.sale.SaleOrderService; import com.lframework.xingyun.sc.vo.sale.QuerySaleOrderVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java index 1aaeb74d40e77ab4d3245473fb9efe130c41d5a1..72513c3f083871400cc36edf2121c6187eb40a74 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java @@ -5,18 +5,18 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.SaleOrder; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.service.sale.SaleOrderService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportTaskWorker.java index 974373b1ad20308314d724de8e7d03cf63658641..8847e1daec98da2e0d4cb8879c753e175886118b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.sale.out; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; import com.lframework.xingyun.sc.vo.sale.out.QuerySaleOutSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java index 5825a0bf12b36ec333e011075be93e4e958dae64..03a09d9725f5ade176e517b52dae05d2fcd205b0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java @@ -5,18 +5,18 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.starter.web.inner.entity.SysUser; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportTaskWorker.java index 714b29ddf9d0fb7d0683e7d356c586c821fcd616..7edbea9b6cb8809b1ba125b4dda42d56def54bd6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.sale.returned; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.service.sale.SaleReturnService; import com.lframework.xingyun.sc.vo.sale.returned.QuerySaleReturnVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportModel.java index 7149a17386577a11fd474a001b61190b36990315..50aec197f7ada2e73e749e91fdd16c614bd961a1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportModel.java @@ -2,9 +2,9 @@ package com.lframework.xingyun.sc.excel.stock; import com.alibaba.excel.annotation.ExcelProperty; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportTaskWorker.java index 0d3fc944f4fcf4f123d5f782e606a1a9fe7d8bb5..a7215cb4208d4374d7b1171298b0a4062ffd55ce 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.service.stock.ProductStockService; import com.lframework.xingyun.sc.vo.stock.QueryProductStockVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportModel.java index 4689d227d0bad430f15fb9d48388cc690d5bad8c..2752c4f6cf71cf1cca15ded37d6e8965323c3870 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportModel.java @@ -5,9 +5,9 @@ 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.NumberUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportTaskWorker.java index cecaaeba777369c5579b0e8b36fef9fa9e2f1a69..9bbd0a430a56f55caf27ae812843f13472d47cfb 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/ProductStockLogExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.ProductStockLog; import com.lframework.xingyun.sc.service.stock.ProductStockLogService; import com.lframework.xingyun.sc.vo.stock.log.QueryProductStockLogVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportModel.java index 449a0952b6bc086d1913c48bb0fd48a5746b2183..7fd651f4010462ef16b995ffb9477278f201eaef 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportModel.java @@ -6,15 +6,15 @@ 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.utils.StringUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.StockAdjustSheet; import com.lframework.xingyun.sc.entity.StockAdjustSheetDetail; import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustSheetDetailService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.util.Date; import java.util.List; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportTaskWorker.java index 316aef8a5c625e6d741c3adc5d6a904356eadb21..37595326e09d850066f313c3ce013c99c0b7a8fe 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/adjust/StockAdjustSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock.adjust; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.StockAdjustSheet; import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustSheetService; import com.lframework.xingyun.sc.vo.stock.adjust.stock.QueryStockAdjustSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportModel.java index e0da3be19b37d94e2b1340fd1563f9cd3bdee3a2..3aec297326a5b23b4d262704b28956f5ff8492c8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportModel.java @@ -3,9 +3,9 @@ package com.lframework.xingyun.sc.excel.stock.take.plan; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.entity.StoreCenter; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportTaskWorker.java index 46fd1b91b9fb69e5e7d8cdd0c78de0c4fe9718fb..c30e5d38012f96193346b66ebd6149dfdc9b4dea 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/plan/TakeStockPlanExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock.take.plan; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.TakeStockPlan; import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService; import com.lframework.xingyun.sc.vo.stock.take.plan.QueryTakeStockPlanVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportModel.java index c9f95a805a8303590b6ba10860b86c3eed1e0383..41301c2650dfcf996ddf4dded007e91f68b77915 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportModel.java @@ -4,9 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; 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.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.PreTakeStockSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportTaskWorker.java index f53cfb21abb841754f5d4d8d2584ade0e5a798a5..0f88d53a3ac486319100c869fb41f4eab5c720a9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/pre/PreTakeStockSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock.take.pre; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.PreTakeStockSheet; import com.lframework.xingyun.sc.service.stock.take.PreTakeStockSheetService; import com.lframework.xingyun.sc.vo.stock.take.pre.QueryPreTakeStockSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportModel.java index f5f7d59154806704536c69fbdb7e443dad0ab3bb..529ded6fcc292fe11909e5d2986bb40bf452a3b8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportModel.java @@ -5,15 +5,15 @@ 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.TakeStockPlan; import com.lframework.xingyun.sc.entity.TakeStockSheet; import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportTaskWorker.java index 8d1323afbec91e8e7963b7788a9378a3b7a08c5c..91ccc896eafa5e0beec46b39a9d1b7afea9b5d5c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/take/sheet/TakeStockSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock.take.sheet; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.TakeStockSheet; import com.lframework.xingyun.sc.service.stock.take.TakeStockSheetService; import com.lframework.xingyun.sc.vo.stock.take.sheet.QueryTakeStockSheetVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportModel.java index 7c907f45daea2110c5a37d3be0591680e7a064cd..e21d541dc0d58d909d16218e46337d878f64456a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportModel.java @@ -4,14 +4,14 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; 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.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.sc.entity.ScTransferOrder; import com.lframework.xingyun.sc.enums.ScTransferOrderStatus; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportTaskWorker.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportTaskWorker.java index 9da304ef0708ecb8eacae9057ad6f5e975e38391..d749e4828fa09e967c09da4d46211e338b66601f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportTaskWorker.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/stock/transfer/ScTransferOrderExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.excel.stock.transfer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.sc.entity.ScTransferOrder; import com.lframework.xingyun.sc.service.stock.transfer.ScTransferOrderService; import com.lframework.xingyun.sc.vo.stock.transfer.QueryScTransferOrderVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetDetailServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetDetailServiceImpl.java index 04807f9054b90f47602231b3668891a620057b15..03d5ae823b503d553b7ebbe5a76f7b24758910f6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetDetailServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetDetailServiceImpl.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.sc.impl.logistics; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.sc.entity.LogisticsSheetDetail; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import com.lframework.xingyun.sc.mappers.LogisticsSheetDetailMapper; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetServiceImpl.java index 20d4996cb3b4ed0472a67e916d29aad74a01e5a3..f3ac7bdb66b1250485c296b69d3af69bd0c9e59f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/logistics/LogisticsSheetServiceImpl.java @@ -10,23 +10,25 @@ 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.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.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.annotations.OrderTimeLineLog; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool; import com.lframework.xingyun.sc.dto.logistics.LogisticsSheetBizOrderDto; import com.lframework.xingyun.sc.dto.logistics.LogisticsSheetFullDto; import com.lframework.xingyun.sc.entity.LogisticsSheet; import com.lframework.xingyun.sc.entity.LogisticsSheetDetail; +import com.lframework.xingyun.sc.enums.LogisticsOpLogType; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import com.lframework.xingyun.sc.enums.LogisticsSheetStatus; -import com.lframework.xingyun.sc.enums.ScOpLogType; import com.lframework.xingyun.sc.mappers.LogisticsSheetMapper; import com.lframework.xingyun.sc.service.logistics.LogisticsSheetDetailService; import com.lframework.xingyun.sc.service.logistics.LogisticsSheetService; @@ -36,8 +38,6 @@ import com.lframework.xingyun.sc.vo.logistics.LogisticsSheetSelectorVo; import com.lframework.xingyun.sc.vo.logistics.QueryLogisticsSheetBizOrderVo; import com.lframework.xingyun.sc.vo.logistics.QueryLogisticsSheetVo; import com.lframework.xingyun.sc.vo.logistics.UpdateLogisticsSheetVo; -import com.lframework.xingyun.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -107,7 +107,7 @@ public class LogisticsSheetServiceImpl extends return PageResultUtil.convert(new PageInfo<>(datas)); } - @OpLog(type = ScOpLogType.LOGISTICS, name = "创建物流单，单号：{}", params = "#code") + @OpLog(type = LogisticsOpLogType.class, name = "创建物流单，单号：{}", params = "#code") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateLogisticsSheetVo vo) { @@ -127,7 +127,7 @@ public class LogisticsSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = ScOpLogType.LOGISTICS, name = "修改物流单，单号：{}", params = "#code") + @OpLog(type = LogisticsOpLogType.class, name = "修改物流单，单号：{}", params = "#code") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateLogisticsSheetVo vo) { @@ -162,7 +162,7 @@ public class LogisticsSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.LOGISTICS, name = "物流单发货，单号：{}", params = "#code") + @OpLog(type = LogisticsOpLogType.class, name = "物流单发货，单号：{}", params = "#code") @Transactional(rollbackFor = Exception.class) @Override public void delivery(DeliveryLogisticsSheetVo vo) { @@ -195,7 +195,7 @@ public class LogisticsSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.LOGISTICS, name = "删除物流单，单号：{}", params = "#code") + @OpLog(type = LogisticsOpLogType.class, name = "删除物流单，单号：{}", params = "#code") @Transactional(rollbackFor = Exception.class) @Override public void deleteById(String id) { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/paytype/OrderPayTypeServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/paytype/OrderPayTypeServiceImpl.java index 5f3289cba533231a36c7a54b305e4361a1d8c0d7..5aee27273bfe9d1d9291214df5a660640cf397ab 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/paytype/OrderPayTypeServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/paytype/OrderPayTypeServiceImpl.java @@ -4,8 +4,8 @@ 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.common.utils.StringUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.IdUtil; import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.mappers.OrderPayTypeMapper; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseConfigServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseConfigServiceImpl.java index e14fbbaeca9ec90befebea3526841be72181e5a1..d7ca87cdba9952890fd4aabbf9485fb1f9bb100a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseConfigServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseConfigServiceImpl.java @@ -1,15 +1,19 @@ package com.lframework.xingyun.sc.impl.purchase; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.bpm.entity.FlowDefinitionWrapper; +import com.lframework.starter.bpm.service.FlowDefinitionWrapperService; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.sc.entity.PurchaseConfig; -import com.lframework.xingyun.sc.enums.ScOpLogType; +import com.lframework.xingyun.sc.enums.PurchaseOpLogType; import com.lframework.xingyun.sc.mappers.PurchaseConfigMapper; import com.lframework.xingyun.sc.service.purchase.PurchaseConfigService; import com.lframework.xingyun.sc.vo.purchase.config.UpdatePurchaseConfigVo; -import com.lframework.xingyun.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; 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; @@ -20,6 +24,9 @@ public class PurchaseConfigServiceImpl extends BaseMpServiceImpl implements PurchaseConfigService { + @Autowired + private FlowDefinitionWrapperService flowDefinitionWrapperService; + @Cacheable(value = PurchaseConfig.CACHE_NAME, key = "@cacheVariables.tenantId() + 'config'", unless = "#result == null") @Override public PurchaseConfig get() { @@ -29,18 +36,32 @@ public class PurchaseConfigServiceImpl extends return config; } - @OpLog(type = ScOpLogType.PURCHASE, name = "修改采购参数设置") + @OpLog(type = PurchaseOpLogType.class, name = "修改采购参数设置") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdatePurchaseConfigVo vo) { PurchaseConfig config = getBaseMapper().selectOne(Wrappers.query()); - config.setReceiveRequirePurchase(vo.getReceiveRequirePurchase()); - config.setReceiveMultipleRelatePurchase(vo.getReceiveMultipleRelatePurchase()); - config.setPurchaseReturnRequireReceive(vo.getPurchaseReturnRequireReceive()); - config.setPurchaseReturnMultipleRelateReceive(vo.getPurchaseReturnMultipleRelateReceive()); + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(PurchaseConfig.class) + .eq(PurchaseConfig::getId, config.getId()) + .set(PurchaseConfig::getReceiveRequirePurchase, vo.getReceiveRequirePurchase()) + .set(PurchaseConfig::getReceiveMultipleRelatePurchase, + vo.getReceiveMultipleRelatePurchase()) + .set(PurchaseConfig::getPurchaseReturnRequireReceive, vo.getPurchaseReturnRequireReceive()) + .set(PurchaseConfig::getPurchaseReturnMultipleRelateReceive, + vo.getPurchaseReturnMultipleRelateReceive()) + .set(PurchaseConfig::getPurchaseRequireBpm, vo.getPurchaseRequireBpm()); + + if (vo.getPurchaseRequireBpm()) { + FlowDefinitionWrapper flowDefinition = flowDefinitionWrapperService.getById(vo.getPurchaseBpmProcessId()); + updateWrapper.set(PurchaseConfig::getPurchaseBpmProcessId, flowDefinition.getId()) + .set(PurchaseConfig::getPurchaseBpmProcessCode, flowDefinition.getFlowCode()); + } else { + updateWrapper.set(PurchaseConfig::getPurchaseBpmProcessId, null) + .set(PurchaseConfig::getPurchaseBpmProcessCode, null); + } - getBaseMapper().updateById(config); + this.update(updateWrapper); OpLogUtil.setExtra(vo); } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderDetailServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderDetailServiceImpl.java index b561114424d34d1af7df2058161f5d54e716476e..3d636e68aec77fa32c108432e5e02e3c622594dc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderDetailServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderDetailServiceImpl.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.sc.impl.purchase; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.sc.entity.PurchaseOrderDetail; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java index b1fcc4a75cd536ae45ccf759cb14e23e33b35a8d..0a960946797ac5be82bfb328f4ab6f417e6790a2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java @@ -4,32 +4,46 @@ 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.bpm.dto.FlowInstanceExtDto; +import com.lframework.starter.bpm.enums.FlowDefinitionExtBizType; +import com.lframework.starter.bpm.listeners.BpmBizListener; +import com.lframework.starter.bpm.service.FlowInstanceWrapperService; +import com.lframework.starter.bpm.transfers.FlowCuInstanceTransfer; 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.BeanUtil; 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.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.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CancelApproveOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.inner.service.system.SysUserService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.core.annotations.OpLog; -import com.lframework.xingyun.core.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -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.bo.purchase.GetPurchaseOrderBo; import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderWithReceiveDto; @@ -38,9 +52,13 @@ import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.entity.PurchaseConfig; import com.lframework.xingyun.sc.entity.PurchaseOrder; import com.lframework.xingyun.sc.entity.PurchaseOrderDetail; +import com.lframework.xingyun.sc.entity.PurchaseOrderDetailForm; +import com.lframework.xingyun.sc.entity.PurchaseOrderForm; +import com.lframework.xingyun.sc.enums.PurchaseOpLogType; import com.lframework.xingyun.sc.enums.PurchaseOrderStatus; -import com.lframework.xingyun.sc.enums.ScOpLogType; import com.lframework.xingyun.sc.events.order.impl.ApprovePassPurchaseOrderEvent; +import com.lframework.xingyun.sc.mappers.PurchaseOrderDetailFormMapper; +import com.lframework.xingyun.sc.mappers.PurchaseOrderFormMapper; import com.lframework.xingyun.sc.mappers.PurchaseOrderMapper; import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService; import com.lframework.xingyun.sc.service.purchase.PurchaseConfigService; @@ -55,13 +73,18 @@ import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseOrderVo; import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseOrderWithReceiveVo; import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseProductVo; import com.lframework.xingyun.sc.vo.purchase.UpdatePurchaseOrderVo; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.dromara.warm.flow.core.dto.FlowParams; +import org.dromara.warm.flow.core.entity.Instance; +import org.dromara.warm.flow.core.listener.ListenerVariable; +import org.dromara.warm.flow.core.service.InsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,6 +92,8 @@ import org.springframework.transaction.annotation.Transactional; public class PurchaseOrderServiceImpl extends BaseMpServiceImpl implements PurchaseOrderService { + private static final String BPM_FLAG = "PurchaseOrder"; + @Autowired private PurchaseOrderDetailService purchaseOrderDetailService; @@ -93,6 +118,18 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderVo vo) { @@ -126,9 +163,12 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = ScOpLogType.PURCHASE, name = "创建订单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建订单") + @OpLog(type = PurchaseOpLogType.class, name = "创建订单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建订单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreatePurchaseOrderVo vo) { - PurchaseOrder order = new PurchaseOrder(); + PurchaseConfig config = purchaseConfigService.get(); + + PurchaseOrder order = newOrder(config.getPurchaseRequireBpm()); order.setId(IdUtil.getId()); order.setCode(generateCodeService.generate(GenerateCodeTypePool.PURCHASE_ORDER)); - this.create(order, vo); + this.create(order, vo, config.getPurchaseRequireBpm()); order.setStatus(PurchaseOrderStatus.CREATED); - getBaseMapper().insert(order); + if (config.getPurchaseRequireBpm()) { + purchaseOrderFormMapper.insert((PurchaseOrderForm) order); + Instance instance = this.startBpmInstance(config.getPurchaseBpmProcessCode(), order.getId()); + order.setFlowInstanceId(instance.getId()); + } else { + getBaseMapper().insert(order); + } OpLogUtil.setVariable("code", order.getCode()); OpLogUtil.setExtra(vo); @@ -187,13 +235,14 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl deleteDetailWrapper = Wrappers.lambdaQuery( - PurchaseOrderDetail.class) - .eq(PurchaseOrderDetail::getOrderId, order.getId()); - purchaseOrderDetailService.remove(deleteDetailWrapper); + if (vo.getIsForm()) { + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + PurchaseOrderDetailForm.class) + .eq(PurchaseOrderDetailForm::getOrderId, order.getId()); + purchaseOrderDetailFormMapper.delete(deleteDetailWrapper); + } else { + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + PurchaseOrderDetail.class) + .eq(PurchaseOrderDetail::getOrderId, order.getId()); + purchaseOrderDetailService.remove(deleteDetailWrapper); + } - this.create(order, vo); + this.create(order, vo, vo.getIsForm()); order.setStatus(PurchaseOrderStatus.CREATED); @@ -222,21 +278,51 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl updateOrderWrapper = Wrappers.lambdaUpdate(PurchaseOrder.class) - .set(PurchaseOrder::getApproveBy, null).set(PurchaseOrder::getApproveTime, null) - .set(PurchaseOrder::getRefuseReason, StringPool.EMPTY_STR) - .eq(PurchaseOrder::getId, order.getId()) - .in(PurchaseOrder::getStatus, statusList); - if (getBaseMapper().updateAllColumn(order, updateOrderWrapper) != 1) { - throw new DefaultClientException("订单信息已过期，请刷新重试！"); + if (vo.getIsForm()) { + PurchaseConfig config = purchaseConfigService.get(); + if (!config.getPurchaseRequireBpm()) { + throw new DefaultClientException("已关闭审批流程，无法重新发起该订单！"); + } + if (!flowInstanceWrapperService.canRestart(order.getId())) { + throw new DefaultClientException("订单不允许重新发起！"); + } + LambdaUpdateWrapper updateOrderWrapper = Wrappers.lambdaUpdate( + PurchaseOrderForm.class) + .set(PurchaseOrderForm::getApproveBy, null).set(PurchaseOrderForm::getApproveTime, null) + .set(PurchaseOrderForm::getRefuseReason, StringPool.EMPTY_STR) + .eq(PurchaseOrderForm::getId, order.getId()) + .in(PurchaseOrderForm::getStatus, statusList); + + if (purchaseOrderFormMapper.updateAllColumn((PurchaseOrderForm) order, updateOrderWrapper) + != 1) { + throw new DefaultClientException("订单信息已过期，请刷新重试！"); + } + + Instance instance = this.startBpmInstance(config.getPurchaseBpmProcessCode(), order.getId()); + updateOrderWrapper = Wrappers.lambdaUpdate( + PurchaseOrderForm.class) + .set(PurchaseOrderForm::getFlowInstanceId, instance.getId()) + .eq(PurchaseOrderForm::getId, order.getId()); + purchaseOrderFormMapper.update(updateOrderWrapper); + } else { + LambdaUpdateWrapper updateOrderWrapper = Wrappers.lambdaUpdate( + PurchaseOrder.class) + .set(PurchaseOrder::getApproveBy, null).set(PurchaseOrder::getApproveTime, null) + .set(PurchaseOrder::getRefuseReason, StringPool.EMPTY_STR) + .eq(PurchaseOrder::getId, order.getId()) + .in(PurchaseOrder::getStatus, statusList); + + if (getBaseMapper().updateAllColumn(order, updateOrderWrapper) != 1) { + throw new DefaultClientException("订单信息已过期，请刷新重试！"); + } } OpLogUtil.setVariable("code", order.getCode()); OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.PURCHASE, name = "审核通过订单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = PurchaseOpLogType.class, name = "审核通过订单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassPurchaseOrderVo vo) { @@ -268,9 +354,7 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl queryWrapper = Wrappers.lambdaQuery( + PurchaseOrderDetailForm.class) + .eq(PurchaseOrderDetailForm::getOrderId, orderForm.getId()); + List detailFormList = purchaseOrderDetailFormMapper.selectList( + queryWrapper); + + PurchaseOrder order = new PurchaseOrder(); + BeanUtil.copyProperties(orderForm, order); + + List detailList = detailFormList.stream().map(detailForm -> { + PurchaseOrderDetail detail = new PurchaseOrderDetail(); + BeanUtil.copyProperties(detailForm, detail); + return detail; + }).collect(Collectors.toList()); + + purchaseOrderService.save(order); + + purchaseOrderDetailService.saveBatch(detailList); + + // 目前订单是已保存状态 + ApprovePassPurchaseOrderVo approveVo = new ApprovePassPurchaseOrderVo(); + approveVo.setId(order.getId()); + + purchaseOrderService.approvePass(approveVo); + } + } + + // 扩展点，可以自定义标题 + private String getBpmTitle(String orderId) { + return ""; + } + + private PurchaseOrder newOrder(boolean isForm) { + if (isForm) { + return new PurchaseOrderForm(); + } else { + return new PurchaseOrder(); + } + } + + private PurchaseOrderDetail newOrderDetail(boolean isForm) { + if (isForm) { + return new PurchaseOrderDetailForm(); + } else { + return new PurchaseOrderDetail(); + } + } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnDetailServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnDetailServiceImpl.java index 76f265d52556d482da958f9fb6b441070cee757d..d9521d858cbf83eab3e839c53a51704b3cc4b2d5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnDetailServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.impl.purchase; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.sc.entity.PurchaseReturnDetail; import com.lframework.xingyun.sc.mappers.PurchaseReturnDetailMapper; import com.lframework.xingyun.sc.service.purchase.PurchaseReturnDetailService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnServiceImpl.java index ef3173f0372d6937afdb35b8859625a9a8ffa680..33863c4c96a03c65ca0415d993e0103c746c7601 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseReturnServiceImpl.java @@ -10,13 +10,24 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; 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.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.inner.service.system.SysUserService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; @@ -24,12 +35,6 @@ import com.lframework.xingyun.basedata.enums.ManageType; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -import com.lframework.xingyun.core.annotations.OpLog; -import com.lframework.xingyun.core.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -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.components.code.GenerateCodeTypePool; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.purchase.returned.PurchaseReturnFullDto; @@ -39,8 +44,8 @@ import com.lframework.xingyun.sc.entity.PurchaseReturnDetail; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.entity.ReceiveSheetDetail; import com.lframework.xingyun.sc.enums.ProductStockBizType; +import com.lframework.xingyun.sc.enums.PurchaseOpLogType; import com.lframework.xingyun.sc.enums.PurchaseReturnStatus; -import com.lframework.xingyun.sc.enums.ScOpLogType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.events.order.impl.ApprovePassPurchaseReturnEvent; import com.lframework.xingyun.sc.mappers.PurchaseReturnMapper; @@ -57,8 +62,6 @@ import com.lframework.xingyun.sc.vo.purchase.returned.QueryPurchaseReturnVo; import com.lframework.xingyun.sc.vo.purchase.returned.ReturnProductVo; import com.lframework.xingyun.sc.vo.purchase.returned.UpdatePurchaseReturnVo; import com.lframework.xingyun.sc.vo.stock.SubProductStockVo; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -127,8 +130,8 @@ public class PurchaseReturnServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = ScOpLogType.PURCHASE, name = "创建采购退货单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建退单") + @OpLog(type = PurchaseOpLogType.class, name = "创建采购退货单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建退单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreatePurchaseReturnVo vo) { @@ -151,8 +154,8 @@ public class PurchaseReturnServiceImpl extends return purchaseReturn.getId(); } - @OpLog(type = ScOpLogType.PURCHASE, name = "修改采购退货单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改退单") + @OpLog(type = PurchaseOpLogType.class, name = "修改采购退货单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改退单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdatePurchaseReturnVo vo) { @@ -216,8 +219,8 @@ public class PurchaseReturnServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.PURCHASE, name = "审核通过采购退货单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = PurchaseOpLogType.class, name = "审核通过采购退货单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassPurchaseReturnVo vo) { @@ -296,7 +299,7 @@ public class PurchaseReturnServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreatePurchaseReturnVo vo) { @@ -314,8 +317,8 @@ public class PurchaseReturnServiceImpl extends return returnId; } - @OpLog(type = ScOpLogType.PURCHASE, name = "审核拒绝采购退货单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = PurchaseOpLogType.class, name = "审核拒绝采购退货单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefusePurchaseReturnVo vo) { @@ -355,7 +358,7 @@ public class PurchaseReturnServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.PURCHASE, name = "删除采购退货单，单号：{}", params = "#code") + @OpLog(type = PurchaseOpLogType.class, name = "删除采购退货单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetDetailServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetDetailServiceImpl.java index 2f934bb583cd68417add5c705508f0ab10137efc..59b0ae6ab0a6d8505b291e315020a5d84f4373f0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetDetailServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetDetailServiceImpl.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.sc.impl.purchase; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.sc.entity.ReceiveSheetDetail; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetServiceImpl.java index 3fd7b020f47d941c6a7a188a853d66c97f0af2f8..dcebb1b818259cb91cb452d8677b7ad572d61a62 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/ReceiveSheetServiceImpl.java @@ -10,12 +10,22 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; 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.IdUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.inner.service.system.SysUserService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.entity.Supplier; @@ -24,11 +34,6 @@ import com.lframework.xingyun.basedata.enums.SettleType; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.service.supplier.SupplierService; -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.components.code.GenerateCodeTypePool; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetFullDto; @@ -39,8 +44,8 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderDetail; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.entity.ReceiveSheetDetail; import com.lframework.xingyun.sc.enums.ProductStockBizType; +import com.lframework.xingyun.sc.enums.PurchaseOpLogType; import com.lframework.xingyun.sc.enums.ReceiveSheetStatus; -import com.lframework.xingyun.sc.enums.ScOpLogType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.mappers.ReceiveSheetMapper; import com.lframework.xingyun.sc.service.purchase.PurchaseConfigService; @@ -58,8 +63,6 @@ import com.lframework.xingyun.sc.vo.purchase.receive.ReceiveProductVo; import com.lframework.xingyun.sc.vo.purchase.receive.ReceiveSheetSelectorVo; import com.lframework.xingyun.sc.vo.purchase.receive.UpdateReceiveSheetVo; import com.lframework.xingyun.sc.vo.stock.AddProductStockVo; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -195,8 +198,8 @@ public class ReceiveSheetServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = ScOpLogType.PURCHASE, name = "创建采购收货单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建收货单") + @OpLog(type = PurchaseOpLogType.class, name = "创建采购收货单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建收货单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateReceiveSheetVo vo) { @@ -219,8 +222,8 @@ public class ReceiveSheetServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = ScOpLogType.RETAIL, name = "创建零售出库单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建出库单") + @OpLog(type = RetailOpLogType.class, name = "创建零售出库单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建出库单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateRetailOutSheetVo vo) { @@ -230,8 +233,8 @@ public class RetailOutSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = ScOpLogType.RETAIL, name = "修改零售出库单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改出库单") + @OpLog(type = RetailOpLogType.class, name = "修改零售出库单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改出库单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateRetailOutSheetVo vo) { @@ -284,8 +287,8 @@ public class RetailOutSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.RETAIL, name = "审核通过零售出库单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = RetailOpLogType.class, name = "审核通过零售出库单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassRetailOutSheetVo vo) { @@ -455,9 +458,11 @@ public class RetailOutSheetServiceImpl extends OpLogUtil.setVariable("code", sheet.getCode()); OpLogUtil.setExtra(vo); + + this.sendApprovePassEvent(sheet); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateRetailOutSheetVo vo) { @@ -475,8 +480,8 @@ public class RetailOutSheetServiceImpl extends return sheetId; } - @OpLog(type = ScOpLogType.RETAIL, name = "审核拒绝零售出库单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = RetailOpLogType.class, name = "审核拒绝零售出库单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseRetailOutSheetVo vo) { @@ -516,7 +521,7 @@ public class RetailOutSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = ScOpLogType.RETAIL, name = "删除零售出库单，单号：{}", params = "#code") + @OpLog(type = RetailOpLogType.class, name = "删除零售出库单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnDetailServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnDetailServiceImpl.java index 8e5ec0b397b466dbb4d8767cf00ab2e66f9b856d..57344f001598feab065682487d1e79dc809a69c8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnDetailServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.impl.retail; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.sc.entity.RetailReturnDetail; import com.lframework.xingyun.sc.mappers.RetailReturnDetailMapper; import com.lframework.xingyun.sc.service.retail.RetailReturnDetailService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnServiceImpl.java index 9f91df11562d99347697f24c643c94786fcc9473..dc7e3d0444ab3a4f53fb8c938745aa77f8c49106 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnServiceImpl.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailReturnServiceImpl.java @@ -11,13 +11,24 @@ 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.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.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; +import com.lframework.starter.web.inner.dto.order.ApprovePassOrderDto; +import com.lframework.starter.web.inner.entity.SysUser; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.inner.service.system.SysUserService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductPurchase; @@ -26,12 +37,6 @@ import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.service.product.ProductPurchaseService; import com.lframework.xingyun.basedata.service.product.ProductService; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; -import com.lframework.xingyun.core.annotations.OpLog; -import com.lframework.xingyun.core.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; -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.components.code.GenerateCodeTypePool; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetDetailLotDto; @@ -43,8 +48,8 @@ import com.lframework.xingyun.sc.entity.RetailOutSheetDetail; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.entity.RetailReturnDetail; import com.lframework.xingyun.sc.enums.ProductStockBizType; +import com.lframework.xingyun.sc.enums.RetailOpLogType; import com.lframework.xingyun.sc.enums.RetailReturnStatus; -import com.lframework.xingyun.sc.enums.ScOpLogType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.events.order.impl.ApprovePassRetailReturnEvent; import com.lframework.xingyun.sc.mappers.RetailReturnMapper; @@ -63,8 +68,6 @@ import com.lframework.xingyun.sc.vo.retail.returned.QueryRetailReturnVo; import com.lframework.xingyun.sc.vo.retail.returned.RetailReturnProductVo; import com.lframework.xingyun.sc.vo.retail.returned.UpdateRetailReturnVo; import com.lframework.xingyun.sc.vo.stock.AddProductStockVo; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -141,8 +144,8 @@ public class RetailReturnServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = ScOpLogType.SALE, name = "创建销售订单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建订单") + @OpLog(type = SaleOpLogType.class, name = "创建销售订单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建订单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSaleOrderVo vo) { @@ -200,8 +203,8 @@ public class SaleOrderServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = ScOpLogType.SALE, name = "创建销售出库单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建出库单") + @OpLog(type = SaleOpLogType.class, name = "创建销售出库单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建出库单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSaleOutSheetVo vo) { @@ -247,8 +250,8 @@ public class SaleOutSheetServiceImpl extends BaseMpServiceImpl { @Sort(value = "createTime", alias = "o", autoParse = true), @Sort(value = "deliveryTime", alias = "o", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List query(@Param("vo") QueryLogisticsSheetVo vo); @@ -55,7 +55,7 @@ public interface LogisticsSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List selector(@Param("vo") LogisticsSheetSelectorVo vo); @@ -64,10 +64,9 @@ public interface LogisticsSheetMapper extends BaseMapper { * 查询业务单据列表 * * @param vo - * @param dataPermission * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List queryBizOrder(@Param("vo") QueryLogisticsSheetBizOrderVo vo); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/OrderPayTypeMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/OrderPayTypeMapper.java index 24e7a1b5f85fbe231ba0de7794b3588dcb6785a3..0b4459b5a8b540fe090bafa6efa798caefcd5872 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/OrderPayTypeMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/OrderPayTypeMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.OrderPayType; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetDetailMapper.java index fbf7bec832a52077b610acb4d10a36ef5b8fb982..6eedc358b238325bff4d009ca880a17ec88cbe0d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.PreTakeStockSheetDetail; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetMapper.java index d953d55a84c912c0a609f2f8a493845331ddd499..569376274faae2817308fcb098a040c09de3e194 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PreTakeStockSheetMapper.java @@ -1,6 +1,12 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.stock.take.pre.PreTakeStockProductDto; import com.lframework.xingyun.sc.dto.stock.take.pre.PreTakeStockSheetFullDto; import com.lframework.xingyun.sc.dto.stock.take.pre.QueryPreTakeStockSheetProductDto; @@ -8,11 +14,6 @@ import com.lframework.xingyun.sc.entity.PreTakeStockSheet; import com.lframework.xingyun.sc.vo.stock.take.pre.PreTakeStockSheetSelectorVo; import com.lframework.xingyun.sc.vo.stock.take.pre.QueryPreTakeStockProductVo; import com.lframework.xingyun.sc.vo.stock.take.pre.QueryPreTakeStockSheetVo; -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; @@ -35,7 +36,7 @@ public interface PreTakeStockSheetMapper extends BaseMapper { @Sort(value = "code", alias = "tb", autoParse = true), @Sort(value = "updateTime", alias = "tb", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List query(@Param("vo") QueryPreTakeStockSheetVo vo); @@ -54,7 +55,7 @@ public interface PreTakeStockSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List selector(@Param("vo") PreTakeStockSheetSelectorVo vo); @@ -75,7 +76,7 @@ public interface PreTakeStockSheetMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -88,7 +89,7 @@ public interface PreTakeStockSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockLogMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockLogMapper.java index 9c5c5beccc0d28089ded2b3abc9eaa8f1e0eff1a..fbc028c7c981b7a174bace06a590f7d40ea2ff9f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockLogMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockLogMapper.java @@ -1,13 +1,13 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.entity.ProductStockLog; import com.lframework.xingyun.sc.vo.stock.log.QueryProductStockLogVo; -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; @@ -40,7 +40,7 @@ public interface ProductStockLogMapper extends BaseMapper { @Sort(value = "bizCode", alias = "gsl", autoParse = true), @Sort(value = "bizType", alias = "gsl", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockMapper.java index 8c00ae01eaa4b2497bb10e139d6e2f2aa096ee4b..ed5646b17399a89125a2e17a95234c2e328dae9c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockMapper.java @@ -1,13 +1,13 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.vo.stock.QueryProductStockVo; -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.math.BigDecimal; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -33,7 +33,7 @@ public interface ProductStockMapper extends BaseMapper { @Sort(value = "productCode", alias = "g.code"), @Sort(value = "stockNum", alias = "gs.stock_num"), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockWarningMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockWarningMapper.java index c73661af4fe676855d39b965a585fb491166ada0..6b93b39b82dfdb2270c9ff46bc487d04dc532072 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockWarningMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ProductStockWarningMapper.java @@ -1,13 +1,13 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.entity.ProductStockWarning; import com.lframework.xingyun.sc.vo.stock.warning.QueryProductStockWarningVo; -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; @@ -33,7 +33,7 @@ public interface ProductStockWarningMapper extends BaseMapper { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailFormMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailFormMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..de4959db73c44b39f7c1655dd8170788b6190957 --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailFormMapper.java @@ -0,0 +1,16 @@ +package com.lframework.xingyun.sc.mappers; + +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.xingyun.sc.entity.PurchaseOrderDetailForm; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zmj + * @since 2021-09-12 + */ +public interface PurchaseOrderDetailFormMapper extends BaseMapper { + +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailMapper.java index 80707c7446fcafa51c7000f310579ec1625b71c6..215f83f3af8a9af36d4513ed97c4cd1144c12f9f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.PurchaseOrderDetail; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderFormMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderFormMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..74ca03336afb54a3e51a78820a32a831445cd6ef --- /dev/null +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderFormMapper.java @@ -0,0 +1,16 @@ +package com.lframework.xingyun.sc.mappers; + +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.xingyun.sc.entity.PurchaseOrderForm; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zmj + * @since 2021-09-12 + */ +public interface PurchaseOrderFormMapper extends BaseMapper { + +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderMapper.java index 7e8321f3895712727ea190f4440d21ce518d699b..059a8c0b0b351fb1bacec36fc7a70ca88b111178 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseOrderMapper.java @@ -1,6 +1,12 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderWithReceiveDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseProductDto; @@ -9,11 +15,6 @@ import com.lframework.xingyun.sc.vo.purchase.PurchaseOrderSelectorVo; import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseOrderVo; import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseOrderWithReceiveVo; import com.lframework.xingyun.sc.vo.purchase.QueryPurchaseProductVo; -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; @@ -38,7 +39,7 @@ public interface PurchaseOrderMapper extends BaseMapper { @Sort(value = "createTime", alias = "o", autoParse = true), @Sort(value = "approveTime", alias = "o", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List query(@Param("vo") QueryPurchaseOrderVo vo); @@ -49,7 +50,7 @@ public interface PurchaseOrderMapper extends BaseMapper { * @param id * @return */ - PurchaseOrderFullDto getDetail(String id); + PurchaseOrderFullDto getDetail(@Param("id") String id, @Param("isForm") Boolean isForm); /** * 选择器 @@ -57,7 +58,7 @@ public interface PurchaseOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List selector(@Param("vo") PurchaseOrderSelectorVo vo); @@ -77,7 +78,7 @@ public interface PurchaseOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List queryWithReceive(@Param("vo") QueryPurchaseOrderWithReceiveVo vo, @@ -89,7 +90,7 @@ public interface PurchaseOrderMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -103,7 +104,7 @@ public interface PurchaseOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnDetailMapper.java index 1e19448bd259dbe115262c093675664758bbf6db..767cf2a72ceb99761a826a0ee70ff3a3a00033e9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.PurchaseReturnDetail; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnMapper.java index 406dd949406a5d0c8e5c06b46ba3f3f716895c76..3486f957c8fddc79c3607e629593fe158a607b60 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/PurchaseReturnMapper.java @@ -1,15 +1,15 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.purchase.returned.PurchaseReturnFullDto; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.vo.purchase.returned.QueryPurchaseReturnVo; -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.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -35,7 +35,7 @@ public interface PurchaseReturnMapper extends BaseMapper { @Sort(value = "createTime", alias = "o", autoParse = true), @Sort(value = "approveTime", alias = "o", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "r") }) List query(@Param("vo") QueryPurchaseReturnVo vo); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetDetailMapper.java index a11c5237ada88afc10b15bd69408173195cdcf50..bde9bd3e16c55729303867ed7dec81a7de8fdf50 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.ReceiveSheetDetail; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetMapper.java index f52d35cd0c9f4aa68d46fc135f09965785015cee..c938d2172e9f8916836e6bae6950da9dde2787d4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ReceiveSheetMapper.java @@ -1,6 +1,11 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetFullDto; import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetWithReturnDto; import com.lframework.xingyun.sc.entity.ReceiveSheet; @@ -8,11 +13,6 @@ import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.vo.purchase.receive.QueryReceiveSheetVo; import com.lframework.xingyun.sc.vo.purchase.receive.QueryReceiveSheetWithReturnVo; import com.lframework.xingyun.sc.vo.purchase.receive.ReceiveSheetSelectorVo; -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.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -38,7 +38,7 @@ public interface ReceiveSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "r", autoParse = true), @Sort(value = "approveTime", alias = "r", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "r") }) List query(@Param("vo") QueryReceiveSheetVo vo); @@ -49,7 +49,7 @@ public interface ReceiveSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "r") }) List selector(@Param("vo") ReceiveSheetSelectorVo vo); @@ -77,7 +77,7 @@ public interface ReceiveSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "r") }) List queryWithReturn(@Param("vo") QueryReceiveSheetWithReturnVo vo, diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailConfigMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailConfigMapper.java index b07774b4c48c8b11a3895ad1288c4ba235f56ec3..31ef2ac36aed2ad6cd9d608ab3dedbfbdc91eb10 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailConfigMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailConfigMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.RetailConfig; public interface RetailConfigMapper extends BaseMapper { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailBundleMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailBundleMapper.java index f0ccd52e15313e83d2453c75ab71dc930ca069dc..159f453ea4e623e227650a7c5ef7b2ecff876585 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailBundleMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailBundleMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.RetailOutSheetDetailBundle; public interface RetailOutSheetDetailBundleMapper extends BaseMapper { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailLotMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailLotMapper.java index 5821fdecb0fbf432e961cc230f1137efb50d7dfc..1e21ee323249550114d7234ec1dab084e1526c48 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailLotMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailLotMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetDetailLotDto; import com.lframework.xingyun.sc.entity.RetailOutSheetDetailLot; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailMapper.java index 4c034a264fcfbba4c0b2d3c0a4c4338ff9721420..bf38e1a6defc86b37b1e6fb617cad2618a7aa1ed 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.RetailOutSheetDetail; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetMapper.java index 8808086bb385ab9ee5b94cbb703075aff9f4ccbe..87ca49b7ed78a4186c1911c0907aa1a8c00478bf 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailOutSheetMapper.java @@ -1,6 +1,12 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.retail.RetailProductDto; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetFullDto; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetWithReturnDto; @@ -9,11 +15,6 @@ import com.lframework.xingyun.sc.vo.retail.out.QueryRetailOutSheetVo; import com.lframework.xingyun.sc.vo.retail.out.QueryRetailOutSheetWithReturnVo; import com.lframework.xingyun.sc.vo.retail.out.QueryRetailProductVo; import com.lframework.xingyun.sc.vo.retail.out.RetailOutSheetSelectorVo; -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; @@ -38,7 +39,7 @@ public interface RetailOutSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "s", autoParse = true), @Sort(value = "approveTime", alias = "s", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List query(@Param("vo") QueryRetailOutSheetVo vo); @@ -49,7 +50,7 @@ public interface RetailOutSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List selector(@Param("vo") RetailOutSheetSelectorVo vo); @@ -77,7 +78,7 @@ public interface RetailOutSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List queryWithReturn(@Param("vo") QueryRetailOutSheetWithReturnVo vo, @@ -89,7 +90,7 @@ public interface RetailOutSheetMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -103,7 +104,7 @@ public interface RetailOutSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnDetailMapper.java index 9a8842806f7d02b5b667c14ca2e5a202b5228d66..9e238218b551a1f69de961a50a1b3ffddd034de8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.RetailReturnDetail; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnMapper.java index 83acb31232afd823d80a2f5b8934b5d92a31994e..0f37afcefa3c1b7f1444040f1b6c1e71170d83e0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/RetailReturnMapper.java @@ -1,14 +1,14 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.retail.returned.RetailReturnFullDto; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.vo.retail.returned.QueryRetailReturnVo; -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; @@ -33,7 +33,7 @@ public interface RetailReturnMapper extends BaseMapper { @Sort(value = "createTime", alias = "r", autoParse = true), @Sort(value = "approveTime", alias = "r", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "r") }) List query(@Param("vo") QueryRetailReturnVo vo); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleConfigMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleConfigMapper.java index ca4c1f6bd44dfbff93ebd39485921d67515765f7..072b118265c4046a3794b363de7f862a267cb091 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleConfigMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleConfigMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.SaleConfig; public interface SaleConfigMapper extends BaseMapper { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailBundleMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailBundleMapper.java index 90475fd329b0bdd9c6f45083b342333b7cdc45b8..0e76b793a1c743daedca9db626f815810cc76682 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailBundleMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailBundleMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.SaleOrderDetailBundle; public interface SaleOrderDetailBundleMapper extends BaseMapper { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailMapper.java index f20065ebba19dbd8678a633e604bd50e2b5a776c..34594cebe218b49c6956c01f95ff1a1bb5b9009a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.SaleOrderDetail; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderMapper.java index d246490ef345c16d34c016a9d1e93f16f9764aae..be7964ee61d7d92dbff2a59a338e0def52027880 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOrderMapper.java @@ -1,6 +1,12 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.sale.SaleOrderFullDto; import com.lframework.xingyun.sc.dto.sale.SaleOrderWithOutDto; import com.lframework.xingyun.sc.dto.sale.SaleProductDto; @@ -9,11 +15,6 @@ import com.lframework.xingyun.sc.vo.sale.QuerySaleOrderVo; import com.lframework.xingyun.sc.vo.sale.QuerySaleOrderWithOutVo; import com.lframework.xingyun.sc.vo.sale.QuerySaleProductVo; import com.lframework.xingyun.sc.vo.sale.SaleOrderSelectorVo; -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; @@ -37,7 +38,7 @@ public interface SaleOrderMapper extends BaseMapper { @Sort(value = "code", alias = "o", autoParse = true), @Sort(value = "createTime", alias = "o", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List query(@Param("vo") QuerySaleOrderVo vo); @@ -56,7 +57,7 @@ public interface SaleOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List selector(@Param("vo") SaleOrderSelectorVo vo); @@ -75,7 +76,7 @@ public interface SaleOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "o") }) List queryWithOut(@Param("vo") QuerySaleOrderWithOutVo vo, @@ -87,7 +88,7 @@ public interface SaleOrderMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -101,7 +102,7 @@ public interface SaleOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailBundleMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailBundleMapper.java index 56d1c6e60a0da88c36c95992b79c4ddf00cce133..c73cf6d182a8a6ea956d58283cbe773d103bdbd7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailBundleMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailBundleMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.SaleOutSheetDetailBundle; public interface SaleOutSheetDetailBundleMapper extends BaseMapper { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailLotMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailLotMapper.java index 0379f90888676929c417a3102b1a0a5c53f0f84f..1eac3ad5e289f211599a67a225ab37ecb306df2c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailLotMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailLotMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetDetailLotDto; import com.lframework.xingyun.sc.entity.SaleOutSheetDetailLot; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailMapper.java index e46ab28b26f106a74205f38577f3d9e9bf30279a..a7621df6d5cac3ecad4a5cb72cdeafe1be0a1450 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.SaleOutSheetDetail; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetMapper.java index 458b94f6c5b3eb001574cd96365ae4c382f8820b..f2beff8272d500c9e8af7a57dee5ff6cd1517820 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleOutSheetMapper.java @@ -1,6 +1,11 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetFullDto; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetWithReturnDto; import com.lframework.xingyun.sc.entity.SaleOutSheet; @@ -8,11 +13,6 @@ import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.vo.sale.out.QuerySaleOutSheetVo; import com.lframework.xingyun.sc.vo.sale.out.QuerySaleOutSheetWithReturnVo; import com.lframework.xingyun.sc.vo.sale.out.SaleOutSheetSelectorVo; -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.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -38,7 +38,7 @@ public interface SaleOutSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "s", autoParse = true), @Sort(value = "approveTime", alias = "s", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List query(@Param("vo") QuerySaleOutSheetVo vo); @@ -49,7 +49,7 @@ public interface SaleOutSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List selector(@Param("vo") SaleOutSheetSelectorVo vo); @@ -77,7 +77,7 @@ public interface SaleOutSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List queryWithReturn(@Param("vo") QuerySaleOutSheetWithReturnVo vo, diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnDetailMapper.java index 4beb6b209327daa29ee0ba8188665d25bd46a71b..12e36d40b94997c63d45409b9e8ccbc1ef7639a6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.SaleReturnDetail; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnMapper.java index c9fa88ad068d482bdba879a60c30f007c9d04c75..580f5c628fc7f6913c2562992683b0c71300b91d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/SaleReturnMapper.java @@ -1,15 +1,15 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.sale.returned.SaleReturnFullDto; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.sc.vo.sale.returned.QuerySaleReturnVo; -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.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -35,7 +35,7 @@ public interface SaleReturnMapper extends BaseMapper { @Sort(value = "createTime", alias = "r", autoParse = true), @Sort(value = "approveTime", alias = "r", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "r") }) List query(@Param("vo") QuerySaleReturnVo vo); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailMapper.java index adf1765867bb43fe0d282090e247258776e787c8..cc237bf43d7f67cf06352b1432d39f5b5fb83af1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.ScTransferOrderDetail; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailReceiveMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailReceiveMapper.java index 7e4925e422f90b9b24cc437768bd3bc5746a62a0..9cc4d226de03ffba1bdfbe81e9338f7d12082b5d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailReceiveMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderDetailReceiveMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.ScTransferOrderDetailReceive; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderMapper.java index 4fa7e63905045625c1db65d21821848297c971f7..deda0e457d1d178f0cf315d093fc4cb0e7265b88 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/ScTransferOrderMapper.java @@ -1,16 +1,17 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.stock.transfer.ScTransferOrderFullDto; import com.lframework.xingyun.sc.dto.stock.transfer.ScTransferProductDto; import com.lframework.xingyun.sc.entity.ScTransferOrder; import com.lframework.xingyun.sc.vo.stock.transfer.QueryScTransferOrderVo; import com.lframework.xingyun.sc.vo.stock.transfer.QueryScTransferProductVo; -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; @@ -34,7 +35,7 @@ public interface ScTransferOrderMapper extends BaseMapper { @Sort(value = "createTime", alias = "tb", autoParse = true), @Sort(value = "approveTime", alias = "tb", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List query(@Param("vo") QueryScTransferOrderVo vo); @@ -54,7 +55,7 @@ public interface ScTransferOrderMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -68,7 +69,7 @@ public interface ScTransferOrderMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustReasonMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustReasonMapper.java index eb20203441da1cb1375b6e69530a310f76ce6b87..c2320159b95a64d1f66942af9abecf75812bbd8b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustReasonMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustReasonMapper.java @@ -1,11 +1,11 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.StockAdjustReason; import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.QueryStockAdjustReasonVo; import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.StockAdjustReasonSelectorVo; -import com.lframework.xingyun.core.annotations.sort.Sort; -import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetDetailMapper.java index 3937183935d73a0f157bcaff958e0cb69ba5f3e8..294891b11a8d7ac25c0d67e1e8ae3e87b5f75b1d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.StockAdjustSheetDetail; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetMapper.java index da5092bc1773c9c8e16c64d2506030d3349c89b4..4f946a9ea5d3be7e219b7a18f6fb9fefcdde9356 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/StockAdjustSheetMapper.java @@ -1,16 +1,17 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.stock.adjust.stock.StockAdjustProductDto; import com.lframework.xingyun.sc.dto.stock.adjust.stock.StockAdjustSheetFullDto; import com.lframework.xingyun.sc.entity.StockAdjustSheet; import com.lframework.xingyun.sc.vo.stock.adjust.stock.QueryStockAdjustProductVo; import com.lframework.xingyun.sc.vo.stock.adjust.stock.QueryStockAdjustSheetVo; -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; @@ -34,7 +35,7 @@ public interface StockAdjustSheetMapper extends BaseMapper { @Sort(value = "updateTime", alias = "tb", autoParse = true), @Sort(value = "approveTime", alias = "tb", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List query(@Param("vo") QueryStockAdjustSheetVo vo); @@ -54,7 +55,7 @@ public interface StockAdjustSheetMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -68,7 +69,7 @@ public interface StockAdjustSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockConfigMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockConfigMapper.java index 82e738af2633a9bc3a7350b66a9a4df8245a456a..64a4d9ec669dfd1d67c33eeabd2a007a3204dbfe 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockConfigMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockConfigMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.TakeStockConfig; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanDetailMapper.java index f315b8da57a58a6e6fae228ac0c0aceaa8e6f197..4852e13cf9df602ea7b4d2d09861a7832a7f9d67 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.dto.stock.take.plan.GetTakeStockPlanDetailProductDto; import com.lframework.xingyun.sc.entity.TakeStockPlanDetail; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanMapper.java index bf7f48143f305ee9ed0662d86447f3f9065561f7..7988b2c94c654c33eefc891075bf1b8764b4bcb4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockPlanMapper.java @@ -1,16 +1,16 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.stock.take.plan.QueryTakeStockPlanProductDto; import com.lframework.xingyun.sc.dto.stock.take.plan.TakeStockPlanFullDto; import com.lframework.xingyun.sc.entity.TakeStockPlan; import com.lframework.xingyun.sc.vo.stock.take.plan.QueryTakeStockPlanVo; import com.lframework.xingyun.sc.vo.stock.take.plan.TakeStockPlanSelectorVo; -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; @@ -34,7 +34,7 @@ public interface TakeStockPlanMapper extends BaseMapper { @Sort(value = "createTime", alias = "tb", autoParse = true), @Sort(value = "updateTime", alias = "tb", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List query(@Param("vo") QueryTakeStockPlanVo vo); @@ -45,7 +45,7 @@ public interface TakeStockPlanMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List selector(@Param("vo") TakeStockPlanSelectorVo vo); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetDetailMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetDetailMapper.java index a3d261658c1c6c1901165c913c038ef2a8ca4846..ff2b1b2a766b73953e4f8372cbf4582c78de522d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetDetailMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.sc.entity.TakeStockSheetDetail; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetMapper.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetMapper.java index 3ec2c5434fba03ff833cfd94bbbddd92c08c11cb..11633c60c7269067dc2462f991fe36683e714bef 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetMapper.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/mappers/TakeStockSheetMapper.java @@ -1,16 +1,17 @@ package com.lframework.xingyun.sc.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; +import com.lframework.starter.web.inner.components.permission.ProductDataPermissionDataPermissionType; import com.lframework.xingyun.sc.dto.stock.take.sheet.TakeStockSheetFullDto; import com.lframework.xingyun.sc.dto.stock.take.sheet.TakeStockSheetProductDto; import com.lframework.xingyun.sc.entity.TakeStockSheet; import com.lframework.xingyun.sc.vo.stock.take.sheet.QueryTakeStockSheetProductVo; import com.lframework.xingyun.sc.vo.stock.take.sheet.QueryTakeStockSheetVo; -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; @@ -34,7 +35,7 @@ public interface TakeStockSheetMapper extends BaseMapper { @Sort(value = "updateTime", alias = "tb", autoParse = true), @Sort(value = "approveTime", alias = "tb", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "tb") }) List query(@Param("vo") QueryTakeStockSheetVo vo); @@ -69,7 +70,7 @@ public interface TakeStockSheetMapper extends BaseMapper { * @param condition * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") @@ -83,7 +84,7 @@ public interface TakeStockSheetMapper extends BaseMapper { * @param vo * @return */ - @DataPermissions(type = SysDataPermissionDataPermissionType.PRODUCT, value = { + @DataPermissions(type = ProductDataPermissionDataPermissionType.class, value = { @DataPermission(template = "product", alias = "g"), @DataPermission(template = "brand", alias = "b"), @DataPermission(template = "category", alias = "c") diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetDetailService.java index aa621151813a1d49674fb7dc1b0a3ac819805a5c..1ecfb86dbf6c191dac27761a340c0fdcba51eca9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.logistics; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.LogisticsSheetDetail; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetService.java index b03a024eccd7b67044d3e7488dbf1d3be8d85c74..1e03b00526e502d41abeb6db174bf258e43266a8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/logistics/LogisticsSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.logistics; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.logistics.LogisticsSheetBizOrderDto; import com.lframework.xingyun.sc.dto.logistics.LogisticsSheetFullDto; import com.lframework.xingyun.sc.entity.LogisticsSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/paytype/OrderPayTypeService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/paytype/OrderPayTypeService.java index 839ce0030bdf92b911c4e06a2c22735ebb00ba49..789afa7afc030062bf2d296c41dc3fd1f56e8e36 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/paytype/OrderPayTypeService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/paytype/OrderPayTypeService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.paytype; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.OrderPayType; import com.lframework.xingyun.sc.vo.paytype.OrderPayTypeVo; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseConfigService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseConfigService.java index 342023a3c8358dba87b3437f348993af920ff35c..7ab1738d47166626288301046f748642f649063e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseConfigService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseConfigService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.PurchaseConfig; import com.lframework.xingyun.sc.vo.purchase.config.UpdatePurchaseConfigVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderDetailService.java index 967ef3c3436c99175e74d6a536675a8d1a765d49..a34cd479e03f5e1c6cb1edd5be3542bfb3946aff 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.PurchaseOrderDetail; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderService.java index 6b47a7de6d17d1fb4ed6902978b52a8ce81401ad..f5869dd53e2d082a0e7acab257d6c2d13b47c07a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseOrderService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderWithReceiveDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseProductDto; @@ -53,7 +53,7 @@ public interface PurchaseOrderService extends BaseMpService { * @param id * @return */ - PurchaseOrderFullDto getDetail(String id); + PurchaseOrderFullDto getDetail(String id, Boolean isForm); /** * 根据ID查询（收货业务） diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnDetailService.java index 643fa568e2a6d4c9defcecb0a870839c73496382..72e2f699624cf689c2df5db8d44513c49e0b2410 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.PurchaseReturnDetail; public interface PurchaseReturnDetailService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnService.java index c70a84d5f6d887672b721a5b647e8c0c97d8be33..c14bdb11a05f5b7d03005e53345fcbb3e6970ea8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/PurchaseReturnService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.purchase.returned.PurchaseReturnFullDto; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.enums.SettleStatus; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetDetailService.java index 6c1dd5a2f0b7e8ddc08ea529de6fe24a85897df7..9474221c88d721d52f700de3f42289454f00a0b3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.ReceiveSheetDetail; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetService.java index 9cd5e1bdd0cec8f2b082f18cbde8923b03e4933f..e664923347ce1e96099dafe4d36ebac385ab30c4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/purchase/ReceiveSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.purchase; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetFullDto; import com.lframework.xingyun.sc.dto.purchase.receive.ReceiveSheetWithReturnDto; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailConfigService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailConfigService.java index a22e6723674fa1911dc297b22adcf98795e316b4..088504c66b69f85fca7f6ebde289f929050f33b0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailConfigService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailConfigService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.RetailConfig; import com.lframework.xingyun.sc.vo.retail.config.UpdateRetailConfigVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailBundleService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailBundleService.java index 6355ab87d36da40216d0682740bca8073ccbe155..12e7bb04012f87967951a3599a5c0cd2f7a831ad 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailBundleService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailBundleService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.RetailOutSheetDetailBundle; public interface RetailOutSheetDetailBundleService extends diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailLotService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailLotService.java index 15f4c91eb7bdd663ca6eb6c6cfd3c553d5a3ff3c..71034a97f4aa63f2d0b24343a5eb2728f5d191a6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailLotService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailLotService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetDetailLotDto; import com.lframework.xingyun.sc.entity.RetailOutSheetDetailLot; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailService.java index e4bd908e8a32a6685e4a8aedb559ee3d85cb3b37..0f610877f87cfd91c9a09efeb469e2044ef8b8f0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.RetailOutSheetDetail; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetService.java index b629b6d86d8f8187a3f498f05367ee6b4038ae26..9d672aefeffa6790e260ba4cdc1a46c2c88821b7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailOutSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.retail.RetailProductDto; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetFullDto; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnDetailService.java index f5a93589a322019dd215fa2dfaa897d388090178..801322c79d5acf6267d6f11c11bdc6c25f8a0d9b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.RetailReturnDetail; public interface RetailReturnDetailService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnService.java index b74341b496ab4c626f99d0ba12dabef306a01162..f76f1688b5227b2e4a2923d71d43cf1f465cbb94 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/retail/RetailReturnService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.retail; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.retail.returned.RetailReturnFullDto; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.vo.retail.returned.ApprovePassRetailReturnVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleConfigService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleConfigService.java index 96059a15f499094c5e3bc8e5c8e765df81281265..6617f980f82ba2e6da86e92c89d4850e06f16fae 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleConfigService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleConfigService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.SaleConfig; import com.lframework.xingyun.sc.vo.sale.config.UpdateSaleConfigVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailBundleService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailBundleService.java index e3d565a21031cd22995fddbf3aae87e3c92dbd66..93326a3be260eaec7b96a894aa35f836015ba5dc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailBundleService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailBundleService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.SaleOrderDetailBundle; public interface SaleOrderDetailBundleService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailService.java index 1527c62bbc74ea4977088e30540eae549bf23e0c..4927a826e456af7e255b15de10fe4fe37f8cf625 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.SaleOrderDetail; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderService.java index 96bcd582e55fdd8c1fc1a8a7070ad8fbdddd5efe..5429247cb9bc1ff263a00c99d50f6b046a6806e9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOrderService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.sale.SaleOrderFullDto; import com.lframework.xingyun.sc.dto.sale.SaleOrderWithOutDto; import com.lframework.xingyun.sc.dto.sale.SaleProductDto; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailBundleService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailBundleService.java index 072a2eb5154c3079fcaa6ca7185000e97149a11b..61ac2557f1175078b6cd86276344e29fefcab71b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailBundleService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailBundleService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.SaleOutSheetDetailBundle; public interface SaleOutSheetDetailBundleService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailLotService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailLotService.java index 319aed2b47316d455521455180a009d7a447c676..62b6e362e8e0ba06fb4da410d61d7fd27c21e644 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailLotService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailLotService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetDetailLotDto; import com.lframework.xingyun.sc.entity.SaleOutSheetDetailLot; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailService.java index e349ce849d439d24b1fac85e01cbcd50f24484a7..3a884e1903f80b3ea66a6777012edfd7579d5522 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.SaleOutSheetDetail; import java.math.BigDecimal; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetService.java index 310de1bf26cf14fa0f6b9ee02527ed5452daad4d..9eaba75f835531c18f1c235db5ded7e39ee23aaf 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleOutSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetFullDto; import com.lframework.xingyun.sc.dto.sale.out.SaleOutSheetWithReturnDto; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnDetailService.java index d972783928f70037244fb4e285e7a9d8d182e522..0cd614e0ddaeba180b26d5a1061f19e9a38c2b2f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.SaleReturnDetail; public interface SaleReturnDetailService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnService.java index 90875bedbbdc095dc69a6fd41f576daf461fef71..2f858fc893af5f6fe5f62593d93cd868e6e81b21 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/sale/SaleReturnService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.sale; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.sale.returned.SaleReturnFullDto; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.enums.SettleStatus; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockLogService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockLogService.java index 4353978877561d1cd1ff9cc36521ce4e4cec93f0..4ac6579b4dea6208a9ce013eb3a9d4a813055b21 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockLogService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockLogService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.ProductStockLog; import com.lframework.xingyun.sc.vo.stock.log.AddLogWithAddStockVo; import com.lframework.xingyun.sc.vo.stock.log.AddLogWithSubStockVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockService.java index 8a3d894f26ae120c4ff534d2a90b985828bb339f..7d40981d8a94b55a6b45666041808a0934b24dc7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/ProductStockService.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.service.stock; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.dto.stock.ProductStockChangeDto; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; +import com.lframework.starter.web.inner.dto.stock.ProductStockChangeDto; import com.lframework.xingyun.sc.entity.ProductStock; import com.lframework.xingyun.sc.vo.stock.AddProductStockVo; import com.lframework.xingyun.sc.vo.stock.QueryProductStockVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustReasonService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustReasonService.java index ee2adfdfaf85cc8c57284034f848a0027571e611..5d65daea1dca5c2906e8e669f946c91c714c457d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustReasonService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustReasonService.java @@ -1,13 +1,12 @@ package com.lframework.xingyun.sc.service.stock.adjust; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.StockAdjustReason; import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.CreateStockAdjustReasonVo; import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.QueryStockAdjustReasonVo; import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.StockAdjustReasonSelectorVo; import com.lframework.xingyun.sc.vo.stock.adjust.stock.reason.UpdateStockAdjustReasonVo; -import java.util.Collection; import java.util.List; public interface StockAdjustReasonService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetDetailService.java index 5874b5a643cebb502545bd9a1cf4a66dcc4f143d..634938151fa419d18721481f694c0bc0a5f8803b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.adjust; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.StockAdjustSheetDetail; public interface StockAdjustSheetDetailService extends diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetService.java index b25fd49b2f3a57e818e6e6333adf8f81338785e5..cd074d4c1ef9f7ddeb7b1e8778af2c64875ba5b3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/adjust/StockAdjustSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock.adjust; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.stock.adjust.stock.StockAdjustProductDto; import com.lframework.xingyun.sc.dto.stock.adjust.stock.StockAdjustSheetFullDto; import com.lframework.xingyun.sc.entity.StockAdjustSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetDetailService.java index e12bb669e7f4a9029df97bd60d3f52d98be68a94..10e1120d16d93922843ec51d7ffcbf0bab9a9856 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.PreTakeStockSheetDetail; public interface PreTakeStockSheetDetailService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetService.java index 7ae12c1bc02b53be8d0a6b433f4646262e89ebbd..e8111361bfc29cb83a12def969ea1ebe638bdf88 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/PreTakeStockSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.stock.take.pre.PreTakeStockProductDto; import com.lframework.xingyun.sc.dto.stock.take.pre.PreTakeStockSheetFullDto; import com.lframework.xingyun.sc.dto.stock.take.pre.QueryPreTakeStockSheetProductDto; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockConfigService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockConfigService.java index c42ae83700b6d0dfbda9e870b61451505d4ea7ed..6f90a1cd83409845ecf2d4f10681df3541d42ed2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockConfigService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockConfigService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.TakeStockConfig; import com.lframework.xingyun.sc.vo.stock.take.config.UpdateTakeStockConfigVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanDetailService.java index 9ba6817b7c4f57d05103f4727c90ad5fae2b4da9..dcbcd8acd737d8ef48cefdc86d73713aed25a329 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.stock.take.plan.GetTakeStockPlanDetailProductDto; import com.lframework.xingyun.sc.entity.TakeStockPlanDetail; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanService.java index 33fb192fd4204f424c05f2e6623b5e49bd750a73..79376d923bca358cc03694097d25ee79de176207 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockPlanService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.stock.take.plan.QueryTakeStockPlanProductDto; import com.lframework.xingyun.sc.dto.stock.take.plan.TakeStockPlanFullDto; import com.lframework.xingyun.sc.entity.TakeStockPlan; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetDetailService.java index 664d5774e6ec0cd74d049469cbba88e77282a83b..005130bb609316c234844391e0e3d27a690324be 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.TakeStockSheetDetail; public interface TakeStockSheetDetailService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetService.java index 177d36b6bd34e1a3413d3e4ad978714ceaf23087..609de66885856b89cc1e0fa263149ce899c20c6e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/take/TakeStockSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock.take; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.stock.take.sheet.TakeStockSheetFullDto; import com.lframework.xingyun.sc.dto.stock.take.sheet.TakeStockSheetProductDto; import com.lframework.xingyun.sc.entity.TakeStockSheet; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailReceiveService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailReceiveService.java index 0d13bda585db7aff0311f1a1c2ec39381c8aa660..cc258facf9c6550bbe94501502e311832ac8d860 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailReceiveService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailReceiveService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.transfer; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.ScTransferOrderDetailReceive; public interface ScTransferOrderDetailReceiveService extends diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailService.java index 745eab8ef48733b319af60cff68a60be770ab767..6429ee97f472d7530eed279de8361ac09b9a88b9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.service.stock.transfer; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.ScTransferOrderDetail; public interface ScTransferOrderDetailService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderService.java index ce102334b81b7bc5db10015daed4b9e5d06bf367..37ba052216a8d9dcab0471a2bafc8db38376a13e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/transfer/ScTransferOrderService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock.transfer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.dto.stock.transfer.ScTransferOrderFullDto; import com.lframework.xingyun.sc.dto.stock.transfer.ScTransferProductDto; import com.lframework.xingyun.sc.entity.ScTransferOrder; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningNotifyService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningNotifyService.java index 4ac03edeca074d4af704b63ca04bd542f494c5d4..5a5a2dffad4804de980778cc24159c9f3c02a103 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningNotifyService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningNotifyService.java @@ -1,9 +1,8 @@ package com.lframework.xingyun.sc.service.stock.warning; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.ProductStockWarningNotify; import java.time.LocalDateTime; -import java.util.List; public interface ProductStockWarningNotifyService extends BaseMpService { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningService.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningService.java index a0d18611d30c30e9309c0eccddf501b3a1be5fa6..969773646095d7e6e38b3e19ae9d332c300d42c6 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningService.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/stock/warning/ProductStockWarningService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.service.stock.warning; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.entity.ProductStockWarning; import com.lframework.xingyun.sc.vo.stock.warning.CreateProductStockWarningVo; import com.lframework.xingyun.sc.vo.stock.warning.QueryProductStockWarningVo; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/address/CreateOrderAddressVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/address/CreateOrderAddressVo.java index 38b44bc3f3c03dc103ccce7ff3a8aec908d15239..870a2166da7714ba62927eccecb4f9596920d5b8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/address/CreateOrderAddressVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/address/CreateOrderAddressVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.address; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.basedata.enums.AddressType; import com.lframework.xingyun.sc.enums.OrderAddressOrderType; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/CreateLogisticsSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/CreateLogisticsSheetVo.java index e37ae62f1c41b4c2c5f211f9c55bda0998c681ec..b91a63e211a866741a7469ba933bdc20f49d6498 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/CreateLogisticsSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/CreateLogisticsSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.logistics; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetBizOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetBizOrderVo.java index 0ef3e527f65586f5e0642325e0d89c61e82d3282..051ebd877375de707ed21fa6e840f6ad46991f54 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetBizOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetBizOrderVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.logistics; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetCalcWeightOrVolumeVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetCalcWeightOrVolumeVo.java index 06eb4dc3bc23e38e0b8afe06a228edd947d7c75a..d6c13550540eccde2213d630312ae8bfa12e3124 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetCalcWeightOrVolumeVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetCalcWeightOrVolumeVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.logistics; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetSelectorVo.java index 565dfb4cfb809be44621debde77b15eff06e43c5..564d26a2a5b18fb75e98f1c92a1e781b44554b46 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/LogisticsSheetSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.logistics; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.LogisticsSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetBizOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetBizOrderVo.java index 80f90ce61d8f0eb7b62b16466fe66afedda8efa9..9c66b32dc04903edb95a59d257fdc8225a96699d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetBizOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetBizOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.logistics; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetVo.java index 083b33fe85e9f0d4fd65cbcf6078430447fc29ef..7e5b2f0268e28539e214f45a32dfc231d4bf4f29 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/logistics/QueryLogisticsSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.logistics; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.LogisticsSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApprovePassPurchaseOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApprovePassPurchaseOrderVo.java index da20469e986de9aeb7c770626e3cab30999b9424..e6d34308d36cdd04604ad910f57adbfdbaaf203e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApprovePassPurchaseOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApprovePassPurchaseOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; @@ -17,10 +17,4 @@ public class ApprovePassPurchaseOrderVo implements BaseVo, Serializable { @ApiModelProperty(value = "订单ID", required = true) @NotBlank(message = "订单ID不能为空！") private String id; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApproveRefusePurchaseOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApproveRefusePurchaseOrderVo.java index 870ae5902eca1ef9c2199fd1fb2b62e324cdd215..318d45bd8f47a8603144f3c16f3eedefef03797f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApproveRefusePurchaseOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/ApproveRefusePurchaseOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/CreatePurchaseOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/CreatePurchaseOrderVo.java index 23493b2a04266f09ea482f1fb006f94df38303ab..89d72de6ec63359eb3505b808a204729d167bfb2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/CreatePurchaseOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/CreatePurchaseOrderVo.java @@ -4,7 +4,7 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; 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.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.vo.paytype.OrderPayTypeVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseOrderSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseOrderSelectorVo.java index 3912ec916e80025243531d674fa2ed57da2ce311..b0782886bf3a910beb185396cf12af005d4fdd8e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseOrderSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseOrderSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.PurchaseOrderStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseProductVo.java index f3e554e47fb1ea3c532cea3aecb1decb750c28df..e7655ff2edba818bc991528d45d212df2583fb87 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/PurchaseProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderVo.java index 3bb5787a846e37e2ca7a6067dd3766d4892f25fc..62237ee0a1fe9f1d90e6728477c8851b93179fc0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.PurchaseOrderStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderWithReceiveVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderWithReceiveVo.java index c8348daf42c60ce4859be3097b72b31705e6fae3..386bdbfdc0df8b12e0a48efbe18cbb2ff7f88d30 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderWithReceiveVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseOrderWithReceiveVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseProductVo.java index dd4640b0d3352b6ee2a930631154c0c2a696f397..8b38b15604c88b1ff32961973a5a76d0c8004bc5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/QueryPurchaseProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/UpdatePurchaseOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/UpdatePurchaseOrderVo.java index 223beaca74717b2731d9f4b6934f98478378f885..c80d3c4727cd22425e7feb2eac8988dc32b5dcb7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/UpdatePurchaseOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/UpdatePurchaseOrderVo.java @@ -16,4 +16,7 @@ public class UpdatePurchaseOrderVo extends CreatePurchaseOrderVo implements Seri @ApiModelProperty(value = "订单ID", required = true) @NotBlank(message = "订单ID不能为空！") private String id; + + @ApiModelProperty(value = "是否为表单数据") + private Boolean isForm = Boolean.FALSE; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/config/UpdatePurchaseConfigVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/config/UpdatePurchaseConfigVo.java index e64fa1ab3c21a5a3630e5f7c07ce02efc50e6ae9..9c132a687a44557121fed29f41b53b5a6ec9dd55 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/config/UpdatePurchaseConfigVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/config/UpdatePurchaseConfigVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.config; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; @@ -38,4 +38,17 @@ public class UpdatePurchaseConfigVo implements BaseVo, Serializable { @ApiModelProperty(value = "采购退货单是否多次关联采购收货单", required = true) @NotNull(message = "采购退货单是否多次关联采购收货单不能为空！") private Boolean purchaseReturnMultipleRelateReceive; + + /** + * 采购订单是否开启审批流程 + */ + @ApiModelProperty(value = "采购订单是否开启审批流程", required = true) + @NotNull(message = "采购订单是否开启审批流程不能为空！") + private Boolean purchaseRequireBpm; + + /** + * 采购订单关联的审批流程ID + */ + @ApiModelProperty(value = "采购订单关联的审批流程ID") + private String purchaseBpmProcessId; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApprovePassReceiveSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApprovePassReceiveSheetVo.java index f63af933b18c7f379279b3239e30a69afa276498..df3c0bee3ffde906d8dd20610759a56037855294 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApprovePassReceiveSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApprovePassReceiveSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.receive; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApproveRefuseReceiveSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApproveRefuseReceiveSheetVo.java index 197197c97aa33a2999ba46767d55a0b9b52432bf..35a4220c16602b2740144b305deec286b454e520 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApproveRefuseReceiveSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ApproveRefuseReceiveSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.receive; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/CreateReceiveSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/CreateReceiveSheetVo.java index 294702d649230181ea9b79176c7757a1160ccfa6..db9b162739265964633883fbf5162fe58bbfb8bd 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/CreateReceiveSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/CreateReceiveSheetVo.java @@ -4,8 +4,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.entity.PurchaseConfig; import com.lframework.xingyun.sc.entity.PurchaseOrderDetail; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetVo.java index 33d4e4732c9ea9d3f87d29c7ae2f441050a3a464..6fec109363fa5b3117bc278a849a0da760df880e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase.receive; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.ReceiveSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetWithReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetWithReturnVo.java index 03490a5f33aea1318f046f423de78a8d48551fb2..e292035468b4ba577e7a88f243c9e91903819a0f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetWithReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/QueryReceiveSheetWithReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.receive; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveProductVo.java index ad5072a598f5d3bf347cfe40a3b3f825d6af8076..eef321827ca3c832d7ed1ef1cad039da3c21247e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.receive; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveSheetSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveSheetSelectorVo.java index 123a315d0446bf14e1c765fdf919d526ffc0adc1..19a205b34a2be771e4a24b42063161b38048b2f9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveSheetSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/ReceiveSheetSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase.receive; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.ReceiveSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/UpdateReceiveSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/UpdateReceiveSheetVo.java index 06941e82d000d87a43a1444071470415f7db8d05..044df1214e56886f550ad25fea62df8e361c9072 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/UpdateReceiveSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/receive/UpdateReceiveSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase.receive; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApprovePassPurchaseReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApprovePassPurchaseReturnVo.java index e08810925201e57e795aa13f6abcf64021e2b7cd..2e66537ae1b51cc64a1fc17cddc8343a66376034 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApprovePassPurchaseReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApprovePassPurchaseReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApproveRefusePurchaseReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApproveRefusePurchaseReturnVo.java index 18828430accb756a48734ffd00eb0662082e6576..5fcc86c00175b7fc7d6bf564daa31a5201030628 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApproveRefusePurchaseReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ApproveRefusePurchaseReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/CreatePurchaseReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/CreatePurchaseReturnVo.java index 5ce416f04a88dc6826d22a2438ed571f17507af3..0b2077ddeacee03449f32c08c790731411307630 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/CreatePurchaseReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/CreatePurchaseReturnVo.java @@ -4,8 +4,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.entity.PurchaseConfig; import com.lframework.xingyun.sc.entity.ReceiveSheetDetail; @@ -136,15 +136,15 @@ public class CreatePurchaseReturnVo implements BaseVo, Serializable { if (!requireReceive) { if (product.getPurchasePrice() == null) { - throw new InputErrorException("第" + orderNo + "行商品采购价不能为空！"); + throw new InputErrorException("第" + orderNo + "行商品退货价不能为空！"); } if (product.getPurchasePrice().doubleValue() < 0D) { - throw new InputErrorException("第" + orderNo + "行商品采购价不允许小于0！"); + throw new InputErrorException("第" + orderNo + "行商品退货价不允许小于0！"); } if (!NumberUtil.isNumberPrecision(product.getPurchasePrice(), 2)) { - throw new InputErrorException("第" + orderNo + "行商品采购价最多允许2位小数！"); + throw new InputErrorException("第" + orderNo + "行商品退货价最多允许2位小数！"); } } else { if (StringUtil.isNotBlank(product.getReceiveSheetDetailId())) { diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/QueryPurchaseReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/QueryPurchaseReturnVo.java index 1fa0b04e973a874d7d4845adf38249a12aa4f7fd..17e0b46fed99246055801b2e55ff8cca0982605f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/QueryPurchaseReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/QueryPurchaseReturnVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase.returned; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.PurchaseReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ReturnProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ReturnProductVo.java index ca3b35f0dc1764766369b1852cea5cd41372fc04..76ead58deb45667e91e279a656e53e4c8ea1bdb9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ReturnProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/ReturnProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.purchase.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; @@ -18,9 +18,9 @@ public class ReturnProductVo implements BaseVo, Serializable { private String productId; /** - * 采购价 + * 退货价 */ - @ApiModelProperty("采购价") + @ApiModelProperty("退货价") private BigDecimal purchasePrice; /** diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/UpdatePurchaseReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/UpdatePurchaseReturnVo.java index 9ecbe6ee1a2af887621b647376330e37ae7d70fb..d49a27690dec196bd9304498c79e0395b67877f7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/UpdatePurchaseReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/purchase/returned/UpdatePurchaseReturnVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.purchase.returned; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.service.purchase.PurchaseReturnService; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/config/UpdateRetailConfigVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/config/UpdateRetailConfigVo.java index ec3c63b020fd774cba69a2929d6978c034e5696c..0f9fe526c56766d48818b752d512f6787633aac5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/config/UpdateRetailConfigVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/config/UpdateRetailConfigVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.config; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApprovePassRetailOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApprovePassRetailOutSheetVo.java index 17fec3f4d46bc6b5d68eeb8b7ea0fdb3e1167b8a..2aa3a695c8939ab7dd5b0e3eca284b41f7273c1a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApprovePassRetailOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApprovePassRetailOutSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApproveRefuseRetailOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApproveRefuseRetailOutSheetVo.java index ce0aa88ec0eaa48ff4f926c4121945e0d61faccc..18a4cf12b5bd50f456b490af245ee9facfd1ffdc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApproveRefuseRetailOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/ApproveRefuseRetailOutSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/CreateRetailOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/CreateRetailOutSheetVo.java index 957c1a8936b1c995dea6e7e4a46652b7d2abefeb..f5486046d643b6a32616abc0c5ade1bc3e997275 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/CreateRetailOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/CreateRetailOutSheetVo.java @@ -5,8 +5,8 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; 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.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.entity.RetailConfig; import com.lframework.xingyun.sc.service.retail.RetailConfigService; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetVo.java index 21e24df67d5df2b58e8696ad71be00259d003333..c2d24ed6b35a535cf3e1f2f64a8bf222025370ae 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.RetailOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetWithReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetWithReturnVo.java index 2e60ba0f224e85b5c97fa9b6ab42bbdea83998ec..a544c5343d8b6ec2db73ab6844a9fa6b6a14819e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetWithReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailOutSheetWithReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailProductVo.java index b292792d77c7e21a479424ddff7bcd3d75bea10f..27b2d715f2abdbeb2fdd2c156c046f0f7ebe821e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/QueryRetailProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutProductVo.java index ad003a5260f511c2c38fd5ff857a68a5e8a84238..6f7523ffdb9823d2344d55098ae2189fda7cfcc8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutSheetSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutSheetSelectorVo.java index 54db7471318cc062a4aa888da12244625e32cbd1..0a143f1a43a54d17d5e17da948d8c27ada940f72 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutSheetSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/RetailOutSheetSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.RetailOutSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/UpdateRetailOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/UpdateRetailOutSheetVo.java index a7cb63712d2d4ab0ef9b270ef9d755b8cb4e12df..b978f1ac4c4a38a17619aadccc6522330f2dae90 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/UpdateRetailOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/out/UpdateRetailOutSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApprovePassRetailReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApprovePassRetailReturnVo.java index 140a60a1f195d8c87f48d4a99469e0e869fe2315..3b8c9c9e2abffdf8b2294d1927c4800565fe3252 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApprovePassRetailReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApprovePassRetailReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApproveRefuseRetailReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApproveRefuseRetailReturnVo.java index 0128b54874ec387beddbbc855ea9f08f4e131afb..07f6c0d4090d77987a5dd1b955cd304b6b65be6b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApproveRefuseRetailReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/ApproveRefuseRetailReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/CreateRetailReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/CreateRetailReturnVo.java index e2093d8eb26c6da65a4581c4190dfd915ffc070f..173c1566bd4a61043afa4b59c3b2328dc67e3d75 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/CreateRetailReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/CreateRetailReturnVo.java @@ -5,8 +5,8 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; 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.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetDetailLotDto; import com.lframework.xingyun.sc.entity.RetailConfig; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/QueryRetailReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/QueryRetailReturnVo.java index 29e966a235ee1ff27564c3800e51801c21baab40..307ecb42a78067e0bad69523fb70a1b8ca9387d5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/QueryRetailReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/QueryRetailReturnVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.retail.returned; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.RetailReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/RetailReturnProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/RetailReturnProductVo.java index 9e14e142b17b6953e00bbfc31ad95f1d70c2eb57..1058b7487535eaaa7693b0803e5a6c92ca5b119b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/RetailReturnProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/RetailReturnProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.retail.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/UpdateRetailReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/UpdateRetailReturnVo.java index 5a1e7cd1850a587e7450c1bc1e292f4beb6c9f7e..d80ad48441f0bf2a9d26ee9d99a7ae742a1c3014 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/UpdateRetailReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/retail/returned/UpdateRetailReturnVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.retail.returned; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.entity.RetailReturn; import com.lframework.xingyun.sc.service.retail.RetailReturnService; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApprovePassSaleOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApprovePassSaleOrderVo.java index f7c6b630fb91e690715d0f1691743c52d9fff9d5..7d474dcd573cc2f70d8e17dc1d80fbf8d31814b0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApprovePassSaleOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApprovePassSaleOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApproveRefuseSaleOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApproveRefuseSaleOrderVo.java index 25fe1876dcd7352f532fa1a183341c6ba292d496..1c89bd23d48157a936af8dcd1321431b0a553f6e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApproveRefuseSaleOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/ApproveRefuseSaleOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/CreateSaleOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/CreateSaleOrderVo.java index 870bed1b2c951684ea100edca382f8b93bf16010..667921dfa244e5ea443c99a4f71440fa44aaaaf1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/CreateSaleOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/CreateSaleOrderVo.java @@ -4,7 +4,7 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; 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.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.vo.paytype.OrderPayTypeVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderVo.java index 5586549fcb3816220d37901ed784959331af568f..546588980e9e2fdd62307cce4b723f1cfeb37ad3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.SaleOrderStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderWithOutVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderWithOutVo.java index 7e5cde906bb32cab09e6fd08154a2046a73a25a9..a6855bfae57765c1de069c1e290f54825aec0628 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderWithOutVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleOrderWithOutVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleProductVo.java index e28d5de15275382a9318b30b6c00c9598754469c..b1f18572969e423420611cdb774a45b323a4ef8a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/QuerySaleProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleOrderSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleOrderSelectorVo.java index d18441cff5f018913dafc9b2d521d31da8c1cedc..de64b1bdb8aabd430dbc22d898cfaa4d2847db44 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleOrderSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleOrderSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.SaleOrderStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleProductVo.java index d6a16f016848d07a3a56406a0b38826dc17c8b96..38ae61e0095cf4bac410355b9e399954421b295e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/SaleProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/config/UpdateSaleConfigVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/config/UpdateSaleConfigVo.java index a5cbebf905089f283d553b09dbd2e8d185d51cdb..39ae9c9eb043592f6603fd2c17d9e4c03f7a5025 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/config/UpdateSaleConfigVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/config/UpdateSaleConfigVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.config; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApprovePassSaleOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApprovePassSaleOutSheetVo.java index 7d597e5a98fa027f50d2c30e71f69541ad241cce..4b1c57011ca976f9a12f24c39409cab19dd67190 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApprovePassSaleOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApprovePassSaleOutSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApproveRefuseSaleOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApproveRefuseSaleOutSheetVo.java index 067cff8a7664916b55989ec343fc0eeeae014107..077e47470c02e3acbb0bbd6944e62e86f713f610 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApproveRefuseSaleOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/ApproveRefuseSaleOutSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/CreateSaleOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/CreateSaleOutSheetVo.java index ff803eb458370c95a9e9125c78425120d9eee81a..bfd872b3cfaad74424e6d159f0eac4180b0c324b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/CreateSaleOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/CreateSaleOutSheetVo.java @@ -4,8 +4,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.entity.SaleConfig; import com.lframework.xingyun.sc.entity.SaleOrderDetail; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java index 9694d4d755df150201ac3a03f36ca9fba29b852d..897cddcb6fb8aadba0b92635d28630227c0384a3 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.sale.out; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.SaleOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetWithReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetWithReturnVo.java index 350d54632486ad2012db7f6ceedc997d5608d6de..ea84ca40ed84e6c08ea243f95a72c6c8b6b3c939 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetWithReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetWithReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.out; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutProductVo.java index 5397041a78a73cc54c78b34f9aca262c4e1129ca..5f76660ab69520dd3950d9794fec3afd9d9d7549 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.out; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutSheetSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutSheetSelectorVo.java index 696e71b99ac334bb30380537ea9d42c1e9033c25..2dc100feede1dbd251ace29457018bd037b15f24 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutSheetSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/SaleOutSheetSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.sale.out; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.SaleOutSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/UpdateSaleOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/UpdateSaleOutSheetVo.java index 5837bf4d8105185a3d798f2ac94403a95e1513a2..7196d31892a03344e4dab3c9f8f0ac6865c8d259 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/UpdateSaleOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/UpdateSaleOutSheetVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.vo.sale.out; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.service.sale.SaleOutSheetService; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApprovePassSaleReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApprovePassSaleReturnVo.java index 924d3eda859c95171e88f1528ea7091445021023..a8e8c47c6111c044d57b036aac0c1a3d74e7b862 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApprovePassSaleReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApprovePassSaleReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApproveRefuseSaleReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApproveRefuseSaleReturnVo.java index 42d75ea2863eb6234ed5d412f78a73c6c301184f..5d37308fcae998437d3c9b193b57be31b3ea853c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApproveRefuseSaleReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/ApproveRefuseSaleReturnVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/CreateSaleReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/CreateSaleReturnVo.java index eed58b8c88bc5d13d7e0dc29747fe5d4cba6ee17..47707a29813e5d1d388c45a8405922bdd89ae603 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/CreateSaleReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/CreateSaleReturnVo.java @@ -4,8 +4,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto; import com.lframework.xingyun.sc.entity.SaleConfig; import com.lframework.xingyun.sc.entity.SaleOutSheetDetail; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java index 028620a3b2e043791685e985be2a06650625cf6f..b7e1c6bd84c3557b6cf761fe9a9cfc6c308638e9 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.sale.returned; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.SaleReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/SaleReturnProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/SaleReturnProductVo.java index be035a2118570ee3bcec062d27b981376dc151f8..08bb98b25c758a6e7266996115775c2f8708b0f8 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/SaleReturnProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/SaleReturnProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.sale.returned; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/UpdateSaleReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/UpdateSaleReturnVo.java index c5d5b30ff9193ea04af2deb0d8df9de4b3895ad3..0ad39be1528ba49457c696c96e12d5526cd8ec1f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/UpdateSaleReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/UpdateSaleReturnVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.sale.returned; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.service.sale.SaleReturnService; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/AddProductStockVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/AddProductStockVo.java index f393b85453c549a666c249890d26a49786604bd5..1dfa62b0b0b3971a2752eaabe1746d58c1cdaa57 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/AddProductStockVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/AddProductStockVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.ProductStockBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/QueryProductStockVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/QueryProductStockVo.java index a403f9d970dc1da3946959287938a8b320ce090f..0069becd025ac264771caddde1d2be47441c5d50 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/QueryProductStockVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/QueryProductStockVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/SubProductStockVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/SubProductStockVo.java index 1adb1b75504e1f7d56ef5af1a20579dfbeb4fb5c..1162814165967b27431e8ec03119f469646fb133 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/SubProductStockVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/SubProductStockVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.ProductStockBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApprovePassStockAdjustSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApprovePassStockAdjustSheetVo.java index 46751e39079a243183c1e76b21a7df3d0be2d801..451caacc416a4da1888716829c72953cd19b793c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApprovePassStockAdjustSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApprovePassStockAdjustSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApproveRefuseStockAdjustSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApproveRefuseStockAdjustSheetVo.java index 00977ef0707dbfcb6c29550c76fb5494434c06e6..149cfb344a6289537d1b25f2c5091486e67393d7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApproveRefuseStockAdjustSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/ApproveRefuseStockAdjustSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/CreateStockAdjustSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/CreateStockAdjustSheetVo.java index c168fad7712402bcad228ab8a52915f5c7a2115d..e6850ac4ff6440ed63bcbabbda4c2149d241e1c4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/CreateStockAdjustSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/CreateStockAdjustSheetVo.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.StockAdjustSheetBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustProductVo.java index 272a902d019fbf3e28e93db3591c97318a8089e4..90059d34af718f85ca730ae8a0e1fad8c0c99949 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustSheetVo.java index 64b5392ce2046c903c66ddd0af2d699bc9983f8b..8218a85ebeac38a84afc92042fd44fb2ec752085 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/QueryStockAdjustSheetVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.StockAdjustSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/StockAdjustProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/StockAdjustProductVo.java index bdf3b572979c19abdde7883d8ab69a6ce9e80e56..daebd0526579cb66fb666503402adfe14a674aa2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/StockAdjustProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/StockAdjustProductVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/CreateStockAdjustReasonVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/CreateStockAdjustReasonVo.java index 5e9c4466fe89780b95a67e58455aecd267c48502..3f9e5981a78976a6ccaef736b83d4f21c87ad62b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/CreateStockAdjustReasonVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/CreateStockAdjustReasonVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock.reason; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/QueryStockAdjustReasonVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/QueryStockAdjustReasonVo.java index bef6167d53ff37875e69829cae10ec2ef205ab8c..ecd7e27c134ab0e5eee6776792904e2dd49fd0fc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/QueryStockAdjustReasonVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/QueryStockAdjustReasonVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock.reason; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/StockAdjustReasonSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/StockAdjustReasonSelectorVo.java index c1b15e89b92ca1909a6610169d023b38b160f996..c5d6ff7f106868a1e70e1843a463db1ce65d3c5e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/StockAdjustReasonSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/StockAdjustReasonSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock.reason; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/UpdateStockAdjustReasonVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/UpdateStockAdjustReasonVo.java index 0243aebfeed4723b59a7885be9bdb34b48f9ce06..3fe225d97ad3ae0d03fa6307354a8a342d42fc0b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/UpdateStockAdjustReasonVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/stock/reason/UpdateStockAdjustReasonVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.adjust.stock.reason; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithAddStockVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithAddStockVo.java index db554e27cc08e50dc74db362cdcddac4a3f6abde..d6ba62ca69057dd821a92b9c73e334b97068f0d7 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithAddStockVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithAddStockVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.log; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.ProductStockBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithSubStockVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithSubStockVo.java index 2c039006d4b4cbd940ca5d50c8a7e77d906655c9..e77246842811be5a2cc9decd4cecdcd92fc3878b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithSubStockVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/AddLogWithSubStockVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.log; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.ProductStockBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/QueryProductStockLogVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/QueryProductStockLogVo.java index 0bc707227549466a14f3268af244be68481236f5..bcfac7897eddeb3afdecb7dffe28533592af4bce 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/QueryProductStockLogVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/log/QueryProductStockLogVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.log; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.ProductStockBizType; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/AddProductLotStockVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/AddProductLotStockVo.java index 8363e4ab74da390e4f1ac193f42bbe94d3fc21d3..8ce3c4a397acdbc94dfbd14eb3a357a83df96a0b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/AddProductLotStockVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/AddProductLotStockVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.lot; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.Min; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/CreateProductLotVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/CreateProductLotVo.java index e0f029e87d1f9011243a6067b2d2c88e889b6c12..773c361926982038f6780c9e0cb1f7de47b58328 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/CreateProductLotVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/CreateProductLotVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.lot; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.ProductStockBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/QueryProductLotVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/QueryProductLotVo.java index c5e19ed0982dd0c841383eadc8ca520a8ec0aea9..68b1ed39917b2fbfa8309f4aec66277bbb2953ef 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/QueryProductLotVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/lot/QueryProductLotVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.lot; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/config/UpdateTakeStockConfigVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/config/UpdateTakeStockConfigVo.java index b70ae220d36df0bba5e68c763575f9f36c6c739f..830d667dc1464e1316e7bc08716e96187f0e7f0d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/config/UpdateTakeStockConfigVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/config/UpdateTakeStockConfigVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.take.config; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.Min; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CancelTakeStockPlanVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CancelTakeStockPlanVo.java index 68efcf77e9870a9ac56c73e15862147c4db952ce..50f8806eb576b2f917890d0bb34b5f40d1c90d12 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CancelTakeStockPlanVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CancelTakeStockPlanVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.plan; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CreateTakeStockPlanVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CreateTakeStockPlanVo.java index 2380b9fc5ad4d7d16d77e2ae0ec8040c4c118cb5..d52f6c58fc5e827a297ad0a075d852ceb7bfb42a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CreateTakeStockPlanVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/CreateTakeStockPlanVo.java @@ -2,10 +2,10 @@ package com.lframework.xingyun.sc.vo.stock.take.plan; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.TakeStockPlanType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/HandleTakeStockPlanVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/HandleTakeStockPlanVo.java index f42b65b75760b54a816070d2c6c645893af5ea7d..b505aa3ec08aeb6465bd64c38a8ba4fb3eca644e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/HandleTakeStockPlanVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/HandleTakeStockPlanVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.plan; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/QueryTakeStockPlanVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/QueryTakeStockPlanVo.java index f96d0cb23662b9af2a4a91ac2edc9f73ab616414..d0c5099c2856390eb4f01027ce001f41a574cecb 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/QueryTakeStockPlanVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/QueryTakeStockPlanVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.take.plan; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.TakeStockPlanStatus; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/TakeStockPlanSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/TakeStockPlanSelectorVo.java index 116d191acac513b021b01fc3d5152e76398359d5..a3c4bd48a9cb151c65887e991201f41fcc530e96 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/TakeStockPlanSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/TakeStockPlanSelectorVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.take.plan; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.TakeStockPlanStatus; import com.lframework.xingyun.sc.enums.TakeStockPlanType; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/UpdateTakeStockPlanVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/UpdateTakeStockPlanVo.java index 1648f1586760192d8af84318cd7e1e3142f6f3ae..4752b9f3b3049c3e1dcf83087644b3f22d3fb248 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/UpdateTakeStockPlanVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/plan/UpdateTakeStockPlanVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.plan; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/CreatePreTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/CreatePreTakeStockSheetVo.java index d62dab2430712924fe96d14112fc4da80700fb58..a7e42a0a29b4498109dcec3fd21fbac354f59355 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/CreatePreTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/CreatePreTakeStockSheetVo.java @@ -1,10 +1,10 @@ package com.lframework.xingyun.sc.vo.stock.take.pre; import com.lframework.starter.common.exceptions.impl.InputErrorException; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.sc.enums.PreTakeStockSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockProductVo.java index dbfe5758831dee5aee7002ee770964d07870f918..33a54381390941cecd1ed9fcc0084fc9388f5d58 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.pre; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockSheetSelectorVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockSheetSelectorVo.java index e3dca38ca2c276464b9680cc70e3dbee22627143..0a62d791bd38cef00d807a2f1fb2b325bbb1e92b 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockSheetSelectorVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/PreTakeStockSheetSelectorVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.take.pre; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.PreTakeStockSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockProductVo.java index 59ec21d08e85e62680a254c266e5151f4d296190..b520673a44434c407cc6853f860c27585cede850 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.pre; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockSheetVo.java index 8acfeabe2b5d3657a9881146720d995ff6279bd1..c9b3b7190b5ba4b7164f598fb82d88b7f0e30880 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/pre/QueryPreTakeStockSheetVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.take.pre; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.PreTakeStockSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApprovePassTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApprovePassTakeStockSheetVo.java index f9a4c69e79e9e147c53f18d60217399816abca0f..fc8e5e78f68af0b922f02a5a6384d053592136f1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApprovePassTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApprovePassTakeStockSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApproveRefuseTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApproveRefuseTakeStockSheetVo.java index bf2c35d30f1ee1d77757d52eabcea8bd2956868d..bdf6cd4879da4cc9e490c55d56c9d07ca3dda4a0 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApproveRefuseTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/ApproveRefuseTakeStockSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/CreateTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/CreateTakeStockSheetVo.java index e97f415a07210faf4294d0c6e2d1a47401650dc1..9b169e797949d937b7d72f3560d2db5bab07bccf 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/CreateTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/CreateTakeStockSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetProductVo.java index db8c007573fcc1f009a033d90043c64a8870e567..d7bac24669ab845f31820a23ebe883d1c32fab01 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetVo.java index 4163bf61f69e6269f0043c8aae2591ef39b91799..24f2e4c169a356fb50dc74761b9222754c9be6bc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/QueryTakeStockSheetVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.TakeStockPlanStatus; import com.lframework.xingyun.sc.enums.TakeStockSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/TakeStockSheetProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/TakeStockSheetProductVo.java index 00b5e9470541db8ee3aa7a4b19f3b4844a5c9bc7..30877f698fab24c3e2de0d9798735355396be47f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/TakeStockSheetProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/TakeStockSheetProductVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/UpdateTakeStockSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/UpdateTakeStockSheetVo.java index 9efd3bcca35d699988de21e0073deca94888e517..8244effc2cb616099c959cc5d61c17c1fe1e7740 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/UpdateTakeStockSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/take/sheet/UpdateTakeStockSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.take.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApprovePassScTransferOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApprovePassScTransferOrderVo.java index 906b04cc1ba9b45e7b8727034444b64f4652fffa..c2c986cb664fdc2f3ac8b0fc08fb99f1ae2b8747 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApprovePassScTransferOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApprovePassScTransferOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApproveRefuseScTransferOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApproveRefuseScTransferOrderVo.java index 3afacc7a92d82a6cc8d9e024e4cebe5696008fef..f4b679e2d189bdbb33973c79b4c5d11778465efc 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApproveRefuseScTransferOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ApproveRefuseScTransferOrderVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/CreateScTransferOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/CreateScTransferOrderVo.java index 3222000f4de31a6d9e0b86c211b7a4d638098a6f..a44d96bf46a6181794d1bd1cb157b461b353da7a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/CreateScTransferOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/CreateScTransferOrderVo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.sc.vo.stock.transfer; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.NumberUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderDetailReceiveVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderDetailReceiveVo.java index 17f3a5502c80f52f08342a2596d0d87bf7c93bd3..2e1080fb1d3b8b4d8891df5ba4fcf2050a3b9522 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderDetailReceiveVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderDetailReceiveVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderVo.java index 9bcba9b12978663312bbeeb0a433a2ebaa50b59a..2e61b4b8bcaa2659ccf58b8473699cc578b8e93d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferOrderVo.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.ScTransferOrderStatus; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferProductVo.java index 99ff26b3142cb94d2c3746828d5629abdf46fbf9..200de716addb9923d470c821bdab76fdfc484488 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/QueryScTransferProductVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import lombok.Data; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ReceiveScTransferOrderVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ReceiveScTransferOrderVo.java index 478ddba4b898bd834cf085fd741e875fe9b84d40..1899fd1c0af4992caeb1e6d24a26c3915940e6d1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ReceiveScTransferOrderVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ReceiveScTransferOrderVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ScTransferProductVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ScTransferProductVo.java index 0e3605d55ea1bfed372fff132c5fe355e0d8e5b4..29adf704f23371f873723e06688990362fa27fc4 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ScTransferProductVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/transfer/ScTransferProductVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.sc.vo.stock.transfer; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/CreateProductStockWarningVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/CreateProductStockWarningVo.java index a4b146916888688980cb57d70c7a87b2d7529b4b..6570998c99cba047f5d2aaa48c427e390296fa39 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/CreateProductStockWarningVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/CreateProductStockWarningVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.warning; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.Min; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/QueryProductStockWarningVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/QueryProductStockWarningVo.java index 47fff4193c544301d700ffd3b8f4db4b9f843b11..5dc7acc045744eed19b203ff224f412aebb1458f 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/QueryProductStockWarningVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/QueryProductStockWarningVo.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.sc.vo.stock.warning; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.TypeMismatch; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/UpdateProductStockWarningVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/UpdateProductStockWarningVo.java index 9a9b6b7d480443dd825199940eb78f1648a0fe11..ea8f1b6649dce4d54ce305eb932de567260d8fb2 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/UpdateProductStockWarningVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/warning/UpdateProductStockWarningVo.java @@ -1,8 +1,6 @@ package com.lframework.xingyun.sc.vo.stock.warning; -import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; diff --git a/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml b/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml index cc1ebd14f62ef66dc08b3055d51fe733e1c4b5ab..df2da37aee611a2522a90b6455f8dfa338a08b2b 100644 --- a/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml +++ b/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml @@ -42,6 +42,7 @@ + @@ -100,6 +101,7 @@ o.total_num, o.total_gift_num, o.total_amount, + o.flow_instance_id, o.description, o.create_by, o.create_time, @@ -132,6 +134,7 @@ o.approve_time, o.status, o.refuse_reason, + o.flow_instance_id, d.id AS detail_id, d.product_id AS detail_product_id, d.order_num AS detail_order_num, @@ -140,8 +143,8 @@ d.tax_rate AS detail_tax_rate, d.description AS detail_description, d.order_no AS detail_order_no - FROM tbl_purchase_order AS o - LEFT JOIN tbl_purchase_order_detail AS d ON d.order_id = o.id + FROM tbl_purchase_order${isForm ? "_form" : ""} AS o + LEFT JOIN tbl_purchase_order_detail${isForm ? "_form" : ""} AS d ON d.order_id = o.id 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 49079b21f85744b317b7e1ecbfbbda2c388ca445..d19c859da138cbf241a9555a57e4ce2cfff82f9f 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 c6508ce0ef8636bd2c7dd3f057d96c5b49ead1b7..2ef44ea75385b8775d8ccc76285feec2628fe1dc 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/SettleCheckBizItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/SettleCheckBizItemBo.java index 461315b90fa6016a682e5d28558b53c4984fe475..9728ce6cfaca4fb73a199d160d1289278edbb12c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/SettleCheckBizItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/SettleCheckBizItemBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.bo.check; 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.core.bo.BaseBo; import com.lframework.xingyun.settle.dto.check.SettleCheckBizItemDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/CustomerSettleCheckBizItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/CustomerSettleCheckBizItemBo.java index 7085896db7a75f5d268f83010acff1210682333d..9defe99d521b34c1cf8639c4aac7f6d0ae836e2e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/CustomerSettleCheckBizItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/CustomerSettleCheckBizItemBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.bo.check.customer; 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.core.bo.BaseBo; import com.lframework.xingyun.settle.dto.check.customer.CustomerSettleCheckBizItemDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; 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 e04083a392a01a3aecc8fbcefa7f5f15012a2159..5c50ef04e11e627b197ad95fbe5290092ad45fb4 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 9c7bbb57a635b346dc4b94e4a87068bd4f7b1ec1..80c20f8148cd8426cdaf5d6f8551514dc8cbaebf 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 196cbff47db65f690448e2811bfcb76e8d5a6a01..de9d9c0f10e9c0bb25c74483c4b09b715cacbdd4 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,8 +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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; @@ -15,7 +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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 1eb622774225f898336a5855bd907b4dc699354b..51d4900aa6dfc67bc8e4c4c87296d392ca8cac1c 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 35f59613852b5adc461dd2275d6cc68146d93af7..6f52f48869e6fa511bf19d20b98c527389d95a4d 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,8 +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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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; @@ -15,7 +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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/QueryCustomerSettleFeeSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/QueryCustomerSettleFeeSheetBo.java index 467357eaf56cd7f7ef83edd3462fadce4e3476f7..952464daccb5da6751862d12407f917d627d857b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/QueryCustomerSettleFeeSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/QueryCustomerSettleFeeSheetBo.java @@ -3,12 +3,12 @@ package com.lframework.xingyun.settle.bo.fee.customer; 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.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; -import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 337da2f1ca14fef2a13c4034cd3e088c32d9b6ce..76efe605c3e1ee786be93a66bfa9e4f4408851c8 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.bo.item.in; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.settle.entity.SettleInItem; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/QuerySettleInItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/QuerySettleInItemBo.java index 2a03b0b8d33de49e576702fb97133b1d91eb91d0..fe6c1f7d33a0d35827e4d8c3b6b59ca38a963620 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/QuerySettleInItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/QuerySettleInItemBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.bo.item.in; 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.core.bo.BaseBo; import com.lframework.xingyun.settle.entity.SettleInItem; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; 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 0f17dc84899cfed21554fa89b3c735c07c5a9225..3952a23364871f6b74afa473542cbe33fc0cfa3e 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.bo.item.in; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.settle.entity.SettleInItem; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 5254eb2ccc862bc0e0063eabb0f3a6ea91f33c99..694f67e83f4ce20efdfc779d490a0b6903038e91 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.bo.item.out; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.settle.entity.SettleOutItem; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/QuerySettleOutItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/QuerySettleOutItemBo.java index 1811fd79ba028130ec69e93a881fd20b81b173f2..ddb5af555d594c7a196234fd87fc799b3d95e59a 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/QuerySettleOutItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/QuerySettleOutItemBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.bo.item.out; 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.core.bo.BaseBo; import com.lframework.xingyun.settle.entity.SettleOutItem; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; 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 463917fe6147f502d71feee0e5da54d965c97226..7d1b9c517ca50d6afe6b6da5a1a96e8a0641b145 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 @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.bo.item.out; -import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.core.bo.BaseBo; import com.lframework.xingyun.settle.entity.SettleOutItem; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 a307753687b81a6ec6ff03983872aff4e7bdfd21..c5d42153c313d666d74e9430ee1789797e67418a 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 48704f1e0f19adb4bd8b73673eb5ec4307394867..5289ca98995a2f236c75e69defbecd65d690bf5e 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 078636c32da0ccc0f535f3815fada8a2ef0e28ae..df32e538e5da1a6783ed801b335b9405eec2c680 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 8fc690d5b2910ff4dcbd58c3cb0419e74ba27bd9..4994d0b126255f980d98eab1b60c43081e12c3e5 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 ffd453e85f168a441d412ca1c5f54a32ea5aeeb5..7fda6006680d0e83b576da5d7fe40200862156a1 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 01c2a788bde6c6bb41e9aa833c38011dd6a59c68..6f4a61da3a5833d64f9877e19e1531d19e440625 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/SettleBizItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/SettleBizItemBo.java index 699384f3a0ac5e6aaced1c02c619905e74e28034..90d5a01fb6fa1f3b9a72d1183ae53f76509eb750 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/SettleBizItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/SettleBizItemBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.bo.sheet; 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.core.bo.BaseBo; import com.lframework.xingyun.settle.dto.sheet.SettleBizItemDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/CustomerSettleBizItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/CustomerSettleBizItemBo.java index ff43257fc4da4820c66b234f6bc8672d0c581581..df3b454f77655c95700f0b1f1c0dde5e7c379888 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/CustomerSettleBizItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/CustomerSettleBizItemBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.bo.sheet.customer; 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.core.bo.BaseBo; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleBizItemDto; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; 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 c36874a68dc439f8c517ce170f307e351d61ad93..779f31853c3b45c2f4a11fea97779349a99ccfca 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 ae89167eca61eb9108c2d088e180f7754bf5e17c..d953c98591ba0ef7e359d1cda11d275fc8f42c6e 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; 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 ab8eca43bd1bf0a617332736c8a6fc3d1ea72cbf..fe332e8f6eaf17aa4838514f497e0536ffca4de6 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.check.customer.CustomerSettleCheckBizItemBo; import com.lframework.xingyun.settle.bo.check.customer.GetCustomerSettleCheckSheetBo; import com.lframework.xingyun.settle.bo.check.customer.QueryCustomerSettleCheckSheetBo; 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 11d32698ee1542abd93e6fe584a08ea1b82570e1..74f3954a6dfe233b2f486423a75c0723696a986c 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.fee.customer.GetCustomerSettleFeeSheetBo; import com.lframework.xingyun.settle.bo.fee.customer.QueryCustomerSettleFeeSheetBo; import com.lframework.xingyun.settle.dto.fee.customer.CustomerSettleFeeSheetFullDto; 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 72792cea9f77341bea5ee5d94e1c55b502029a2e..78054250fce70366d2d92dc32fac1c57c96b7cd8 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.pre.customer.GetCustomerSettlePreSheetBo; import com.lframework.xingyun.settle.bo.pre.customer.QueryCustomerSettlePreSheetBo; import com.lframework.xingyun.settle.dto.pre.customer.CustomerSettlePreSheetFullDto; 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 377f46f64a1732bff918541b3935aec1d80fc8e9..ac334e6e6e16a90209317ccbab480a683aebf420 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.sheet.customer.CustomerSettleBizItemBo; import com.lframework.xingyun.settle.bo.sheet.customer.GetCustomerSettleSheetBo; import com.lframework.xingyun.settle.bo.sheet.customer.QueryCustomerSettleSheetBo; 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 a155189b56b333ededd52dd13d5af2e0fd70d77c..3f71223119775469280e9a565ed7b61085b7756c 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.check.GetSettleCheckSheetBo; import com.lframework.xingyun.settle.bo.check.QuerySettleCheckSheetBo; import com.lframework.xingyun.settle.bo.check.SettleCheckBizItemBo; 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 78ea15095a1be0832c1036619438c67c6b944a60..5c9b1b8a3b298157b57f36605995f4da7c6ff19f 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.fee.GetSettleFeeSheetBo; import com.lframework.xingyun.settle.bo.fee.QuerySettleFeeSheetBo; import com.lframework.xingyun.settle.dto.fee.SettleFeeSheetFullDto; 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 e1ddc7d6959882f71cd0094936ada7db260f7034..aa197d360586c343d2d559d94616f992f04807cc 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 @@ -2,13 +2,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.item.in.GetSettleInItemBo; import com.lframework.xingyun.settle.bo.item.in.QuerySettleInItemBo; import com.lframework.xingyun.settle.entity.SettleInItem; 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 5d068b9054540b01e819d5507e33cdd4cf8be159..de87e248ddac2ecdee7fbc4231c0f8d5ab3f93f4 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 @@ -2,13 +2,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.item.out.GetSettleOutItemBo; import com.lframework.xingyun.settle.bo.item.out.QuerySettleOutItemBo; import com.lframework.xingyun.settle.entity.SettleOutItem; 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 8b123236223be4c3ddc476e6d12ca461b8f1cc5a..4ad8d6d3c6d45b8ddcdbfece7df05165dcb9ab7d 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 @@ -1,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.pre.GetSettlePreSheetBo; import com.lframework.xingyun.settle.bo.pre.QuerySettlePreSheetBo; import com.lframework.xingyun.settle.dto.pre.SettlePreSheetFullDto; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSelectorController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSelectorController.java index d345eb39aa1238306c52a059f9987dbd13fb50cc..958f0822988ff644a28559bdafd84ea0e417fb8e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSelectorController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSelectorController.java @@ -2,11 +2,11 @@ package com.lframework.xingyun.settle.controller; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -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 com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; import com.lframework.xingyun.settle.bo.item.in.SettleInItemSelectorBo; import com.lframework.xingyun.settle.bo.item.out.SettleOutItemSelectorBo; import com.lframework.xingyun.settle.entity.SettleInItem; 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 c3ba679fa3b861f6f390e38e1245160dcd285854..3999bf50e4d2f1a7022fc7d810faab557af3329e 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,13 +1,13 @@ package com.lframework.xingyun.settle.controller; 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.core.utils.ExportTaskUtil; +import com.lframework.starter.web.core.annotations.security.HasPermission; +import com.lframework.starter.web.core.controller.DefaultBaseController; +import com.lframework.starter.web.core.components.resp.InvokeResult; +import com.lframework.starter.web.core.components.resp.InvokeResultBuilder; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.mq.core.utils.ExportTaskUtil; import com.lframework.xingyun.settle.bo.sheet.GetSettleSheetBo; import com.lframework.xingyun.settle.bo.sheet.QuerySettleSheetBo; import com.lframework.xingyun.settle.bo.sheet.SettleBizItemBo; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckBizItemDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckBizItemDto.java index a963b6ea42a827f119f567ad9297447014c43748..89fc89cd8657460405a607d1636830e856162858 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckBizItemDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckBizItemDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.check; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.SettleCheckSheetBizType; import com.lframework.xingyun.settle.enums.SettleCheckSheetCalcType; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckSheetFullDto.java index fc1b8109da5f06079c9410b61ef0426c9e581487..de7de99a97b2722c1012f957480f323b0daed15f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/SettleCheckSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.check; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettleCheckSheetBizType; import com.lframework.xingyun.settle.enums.SettleCheckSheetCalcType; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckBizItemDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckBizItemDto.java index 37765c08c9e3e0e7c336af96284b435826561f0b..e9ea20718817040377ba722ed51706acb966beec 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckBizItemDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckBizItemDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.check.customer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetBizType; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetCalcType; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckSheetFullDto.java index d59f03548d862f5ea08bb11170875c09127868d0..b287c925953255d5d5f10b61b76117e6fe163b97 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/check/customer/CustomerSettleCheckSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.check.customer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetBizType; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetCalcType; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/SettleFeeSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/SettleFeeSheetFullDto.java index d10393a14438026b9359731401d73a17a3667b67..e9375c9da7aa1e69b221629cee25ba52e77d9200 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/SettleFeeSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/SettleFeeSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.fee; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettleFeeSheetStatus; import com.lframework.xingyun.settle.enums.SettleFeeSheetType; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/customer/CustomerSettleFeeSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/customer/CustomerSettleFeeSheetFullDto.java index e772a8884cd2156abcdd58d669928cb7dc176541..f2b9ffd0138c68c7b74c16892edd5d2562313fc6 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/customer/CustomerSettleFeeSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/fee/customer/CustomerSettleFeeSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.fee.customer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetStatus; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetType; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/SettlePreSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/SettlePreSheetFullDto.java index 4be15ab4cd56a516ad3b52aaa03167df417091c3..c2aef6f7496442d3ef73e6df4401811a7dc0a0c1 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/SettlePreSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/SettlePreSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.pre; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettlePreSheetStatus; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/customer/CustomerSettlePreSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/customer/CustomerSettlePreSheetFullDto.java index fc6fad5b2e0b2ee972b594d54327a97295a5f7f9..4056e091abaf092ef934afda8d4b747581f98438 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/customer/CustomerSettlePreSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/pre/customer/CustomerSettlePreSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.pre.customer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettlePreSheetStatus; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleBizItemDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleBizItemDto.java index c5a02fed1eb1ebbce56a349657d849a3d82f34d5..f85a83a9cede2bb13240fd54d2a6db8e39e0dbf6 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleBizItemDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleBizItemDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.sheet; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleSheetFullDto.java index e671d4a089b306bc34c772b22433966c4420c458..bc054340fd1b536b513efac54f8fc4d7132b2a7b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/SettleSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.sheet; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.SettleSheetStatus; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleBizItemDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleBizItemDto.java index 3784042b220be30daf1d2c64bb6fc21fb4be19fe..2994f5a502664c07494eeb6783d82de4217e3913 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleBizItemDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleBizItemDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.sheet.customer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleSheetFullDto.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleSheetFullDto.java index 21fb87b1e91c98e31cd2cb4683094454baf25bd2..e74b03d973d6723c1450eedeb55fb8b9d1302fb1 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleSheetFullDto.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/dto/sheet/customer/CustomerSettleSheetFullDto.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.dto.sheet.customer; -import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.SettleSheetStatus; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheet.java index 27c3bbddfba8537c3a7183c8f4eb46a3ef5334c7..796c1c1b8f8b735fc5ee39b2275611c1d4fb5c09 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetStatus; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheetDetail.java index 3d6caf9f024471694c7355ec29d82dc03dc19a86..b22aacb33cc29f23f7b8bbefc2e51668b45466b0 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleCheckSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetBizType; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetCalcType; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheet.java index 99bcfa124334397f85ecd592493ef8587240eae0..45c2ff3c1425b331fbf4d3bd2eb63d719c5ae6e7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetStatus; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetType; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheetDetail.java index 710a277ef657883c3f8c79163b26c533b3dda13b..c60e6454714b92c757a1380f5f227060ec16dba8 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleFeeSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheet.java index 7e1fd49a855e6acb4bda9575e80ae93782937e91..1229e203d35701b44c44ecdc8744a4e6e7a5b766 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettlePreSheetStatus; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheetDetail.java index abdf41c6cbe7177131945c1cdae42f51a79029e4..8bc83245674df3dde9a5ff5ccd94803095201463 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettlePreSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheet.java index 3f6bdf667c110a1d7bcd9f9da53b9593fc0cd2ce..096c66de99cb4af8722f60295aa91fe7571c88ad 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.CustomerSettleSheetStatus; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheetDetail.java index 2be6847525f5cb5f8c8edf8341132bd16bf8d606..f1d81f76b82e22c7a655623f6add22169e797b30 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/CustomerSettleSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheet.java index 95b5f16f069643360c8afc72449f0efe16e3393e..2adce054bcee065049eee27d8d5d0fdcb23cd80b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettleCheckSheetStatus; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheetDetail.java index 1f40734f3e3506bbcb83112d2280e22ee3ddea4f..650c5fbf30a81f23ad9e02f94a506c320fb1400a 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleCheckSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.SettleCheckSheetBizType; import com.lframework.xingyun.settle.enums.SettleCheckSheetCalcType; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheet.java index 22bfa0789027080b4c59bb8b996d2fedd299fceb..7f9883fdf2c646a20acb63864772c08ab0fb30d0 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettleFeeSheetStatus; import com.lframework.xingyun.settle.enums.SettleFeeSheetType; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheetDetail.java index 334c67c315eb63cb6c2180772ad5dac42c2f6fcd..8058764efa81c39c75c0963c1f3b7a48840459af 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleFeeSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleInItem.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleInItem.java index 1033115b4dc15e5245ecc4209f5749c2d3a4ca3b..ddbe80b7c275e264fd0cab2d5afd1968ca818c5f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleInItem.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleInItem.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleOutItem.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleOutItem.java index 838954727ace6e1f9dcddaeaeef6f43e2ace056e..54874444afdd767e6ba66f06316249918c9d2b57 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleOutItem.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleOutItem.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheet.java index 898da61127bd1c2afad4f159b73ec11076f08e2d..ebbef891cc739d5be0fd2c1fb870c2f6832fba07 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettlePreSheetStatus; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheetDetail.java index 3d8f427ecf83e4abd5239827c2f3116c27bded7f..f4cadf1ab4598482665d1f93a5dccd79b086b11c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettlePreSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheet.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheet.java index f47b51762edbc36e5836db3531229bb0396c6e35..19b68b1cad43b2508657c109a80c259d52bf8a37 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheet.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheet.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import com.lframework.xingyun.settle.enums.SettleSheetStatus; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheetDetail.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheetDetail.java index 43a485d27085a61b97327af786e86a72fb86b472..64e5fe20a9cdab30bf50bde31aa7f251c405d0cc 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheetDetail.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/entity/SettleSheetDetail.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.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.core.entity.BaseEntity; +import com.lframework.starter.web.core.dto.BaseDto; import java.math.BigDecimal; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetBizType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetBizType.java index 3c9ab059d5ff02a46addfd7e7b2adcebad404bab..7e760968af41bae5b0f6792f67dbefd38ff29380 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetBizType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetBizType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettleCheckSheetBizType implements BaseEnum { OUT_SHEET(1, "销售出库单"), SALE_RETURN(2, "销售退单"), SETTLE_FEE_SHEET(3, "客户费用单"), SETTLE_PRE_SHEET(4, diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetCalcType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetCalcType.java index f8f9b727ae2ca29d6456ca90cc3d966313124a8f..f4bea40547a4fa33e1e0046c069fbcfd36ffde46 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetCalcType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetCalcType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettleCheckSheetCalcType implements BaseEnum { ADD(1, "加"), SUB(2, "减"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetStatus.java index c472394a170d95ccb030498474abe437e3a85582..e00a0f3c52933725f258c86ca7da3c67c203961c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleCheckSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettleCheckSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetStatus.java index bb4cf0cffb81642f583f9553821bc035df0936e8..a486c4bca11a56d430c0416865a0d1c7ce8776ac 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettleFeeSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetType.java index c4cd96db4e2b4571dd8af4cbd3ed8e7297a1a75f..ff2cd0bf5ec3a8421f3e31c4e9d2bfed8d1ddfaa 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleFeeSheetType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettleFeeSheetType implements BaseEnum { RECEIVE(1, "应收款"), PAY(2, "应付款"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettlePreSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettlePreSheetStatus.java index c8295c0b2e4e968dc2f2521fbfc2cff84d24648f..81a6cb2dd6d4bdc7bd1b95a0fb944b8931a48430 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettlePreSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettlePreSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettlePreSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleSheetStatus.java index f39af1d936c1a179ef2180676b0b18cab810f816..9198c260c5b9378b93eee90a3605210c94eadbcd 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/CustomerSettleSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum CustomerSettleSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetBizType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetBizType.java index 804c14d30ce983edbe8b8061df64b49fbf0526ca..b20ebf0b1d02863ef62cc80cf4ec1f796c5d55ef 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetBizType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetBizType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleCheckSheetBizType implements BaseEnum { RECEIVE_SHEET(1, "采购收货单"), PURCHASE_RETURN(2, "采购退单"), SETTLE_FEE_SHEET(3, "供应商费用单"), SETTLE_PRE_SHEET(4, diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetCalcType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetCalcType.java index 0c2ce1f13681052c9c257efea7279410e1a64317..8cb0746d28fe0610778774cc0a517e5ee5d4aa24 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetCalcType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetCalcType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleCheckSheetCalcType implements BaseEnum { ADD(1, "加"), SUB(2, "减"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetStatus.java index 12616fa28664a00dfa172f18413869d2adbfdf16..9860bf780e6bfb0fb5185e62ca018c5931687078 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleCheckSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleCheckSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetStatus.java index ffb73ae505e9ec8b01f1ec307474b9fbaa822de6..edce04e02f8efe0a6904622af6a112189bac9af1 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleFeeSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetType.java index e8eb25d366dad9b823e23ed7660ea1e2fbede2bb..c380e874ee9d611b9c580d74998b4d69c5c32f8e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleFeeSheetType.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleFeeSheetType implements BaseEnum { RECEIVE(1, "应收款"), PAY(2, "应付款"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleOpLogType.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleOpLogType.java index 5b05b7a70cc5f25c40c54f2da53e5f45b1d1182f..4ff42fce275c93e54be09c83b448ebe27b33db01 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleOpLogType.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleOpLogType.java @@ -1,7 +1,12 @@ package com.lframework.xingyun.settle.enums; -public interface SettleOpLogType { +import com.lframework.starter.web.core.components.oplog.OpLogType; +import org.springframework.stereotype.Component; - // 结算业务 - int SETTLE = 3000; +@Component +public class SettleOpLogType implements OpLogType { + @Override + public Integer getCode() { + return 3000; + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettlePreSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettlePreSheetStatus.java index bd097603622c889ecefa1d6c5b2e2d48460c6b89..d5ceccfd126a13c2e4e1f39b28c71abc524aae4b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettlePreSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettlePreSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettlePreSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleSheetStatus.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleSheetStatus.java index 1b726266a6d13504e6954b056de8e8eb313f13dc..801bc42758e1a9ac5cb5c7348961c9ab287f1c4b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleSheetStatus.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/enums/SettleSheetStatus.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; +import com.lframework.starter.web.core.enums.BaseEnum; public enum SettleSheetStatus implements BaseEnum { CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); 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 1f592a1ad8d5f85bf73fb5041fb640d6e4c77a50..b9e41cc13767a90e05999e3525978f5c681463fb 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportTaskWorker.java index 94c5ba7455d4ce4bdc2ef3504c0dfe480e6d29ff..e937b97ba53bcdb7dda63b2658340cf254897c8a 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.check; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.SettleCheckSheet; import com.lframework.xingyun.settle.service.SettleCheckSheetService; import com.lframework.xingyun.settle.vo.check.QuerySettleCheckSheetVo; 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 785edeb507e05245e132c95958d6df59c08ad3d7..3e2a5353ad274c0041092524058ef21664ca907d 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportTaskWorker.java index 9e41d8e1d05cc18052d3fe8c35fe839522785b27..796de2ab99a55a27ef864438f2ee4ae774b6c516 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.check.customer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheet; import com.lframework.xingyun.settle.service.CustomerSettleCheckSheetService; import com.lframework.xingyun.settle.vo.check.customer.QueryCustomerSettleCheckSheetVo; 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 7bb940766eb7299d17cd5c3b4e9b969fba0885f4..47d5a5e567579c6715192e2e58e8138c4e8ab574 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportTaskWorker.java index f54558994ed24aee01307f552a72ed1f63105c8c..dd9a5c2e4d54e1008852b3d5bd61c90159d9a03f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.fee; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.SettleFeeSheet; import com.lframework.xingyun.settle.service.SettleFeeSheetService; import com.lframework.xingyun.settle.vo.fee.QuerySettleFeeSheetVo; 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 9c232792a0fbf95a1eaceec242a1bf39c14e38ee..8aa33b442945ad3d2323d95d791faded81c2b36a 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportTaskWorker.java index edd3af7f18ea39e4f2d9af366c5de138b95aa8eb..cb842c2e4a7d11e20a8c8fdf5bfc17240c7daf03 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.fee.customer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; import com.lframework.xingyun.settle.service.CustomerSettleFeeSheetService; import com.lframework.xingyun.settle.vo.fee.customer.QueryCustomerSettleFeeSheetVo; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportModel.java index bbadeb86ab9fe66db0af03a0fd641c756fc59ab8..8a430c5901894d087c11c73cd848b61fe0a67167 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportModel.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.excel.item.in; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.settle.entity.SettleInItem; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportTaskWorker.java index 94d1ecb0460b3c218904b4bec058e03271502878..4977124d891e9e51ffbbd534980392e20c62c8fe 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/in/SettleInItemExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.item.in; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.SettleInItem; import com.lframework.xingyun.settle.service.SettleInItemService; import com.lframework.xingyun.settle.vo.item.in.QuerySettleInItemVo; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportModel.java index 2ed281f04b9b714acf806768fcd44d20c2a5a40b..e406d1d8e2198b82f24f95711ccf45da258d67f3 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportModel.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.settle.excel.item.out; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; import com.lframework.xingyun.settle.entity.SettleOutItem; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportTaskWorker.java index bcc542e95d5e98a521882eeb553267b8389551e0..ec7a736d90c9d4a02e873a2c0472349c87547742 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/item/out/SettleOutItemExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.item.out; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.SettleOutItem; import com.lframework.xingyun.settle.service.SettleOutItemService; import com.lframework.xingyun.settle.vo.item.out.QuerySettleOutItemVo; 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 378f713ee1b3c555e1b1978608f455ba411cb209..f1abe87f75b3064ded0ffa067d8dc6f06d7c23e0 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportTaskWorker.java index 097d0dff1aefb97b59e7dffda7a917be95808f7a..c0a5fe3160973617a39486c73ab2d960eda63719 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.pre; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.SettlePreSheet; import com.lframework.xingyun.settle.service.SettlePreSheetService; import com.lframework.xingyun.settle.vo.pre.QuerySettlePreSheetVo; 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 3d8783a721973d73abb2be87b771d2c1fc622377..6df8b51f56efc02f6386c0fdfb7280d381bd0798 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportTaskWorker.java index 681f6f4b8fa4570c9ccb410c559a6f3e5a8773a0..dba3bf0181a4948a421455fb97da4720bcb90991 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.pre.customer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; import com.lframework.xingyun.settle.service.CustomerSettlePreSheetService; import com.lframework.xingyun.settle.vo.pre.customer.QueryCustomerSettlePreSheetVo; 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 5b45c407d8b71abe47397c4f9a06228c1c500963..b58cf48bb6cd9ed1815932b6396505c070da804a 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportTaskWorker.java index cb96779871b6790a57ce0b12c3c8db5f560c153a..b5379dc8ff8e332f54c109099ba4cdd3245ca85c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.sheet; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.SettleSheet; import com.lframework.xingyun.settle.service.SettleSheetService; import com.lframework.xingyun.settle.vo.sheet.QuerySettleSheetVo; 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 60eaefb713bcee8029b62c3e3eb34bf910225a7b..9055842580ef3540a0b3225c5a9da098dcdb355c 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.starter.web.bo.BaseBo; -import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.core.bo.BaseBo; +import com.lframework.starter.web.core.components.excel.ExcelModel; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.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.starter.web.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 com.lframework.starter.web.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportTaskWorker.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportTaskWorker.java index e3e53092ed3c1f2c3f33b4d0a76cbd3427fab290..f3ddd3356bdbc32598ad3cf254c83a0854022be6 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportTaskWorker.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportTaskWorker.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.settle.excel.sheet.customer; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.JsonUtil; -import com.lframework.xingyun.core.components.export.ExportTaskWorker; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.ApplicationUtil; +import com.lframework.starter.web.core.utils.JsonUtil; +import com.lframework.starter.mq.core.components.export.ExportTaskWorker; import com.lframework.xingyun.settle.entity.CustomerSettleSheet; import com.lframework.xingyun.settle.service.CustomerSettleSheetService; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerSettleSheetVo; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetDetailServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetDetailServiceImpl.java index 78b05217565e2cf4e890caa0afcab854b2113725..5cf00930078753ded31af6d011f3537a6f282446 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetDetailServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.impl; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheetDetail; import com.lframework.xingyun.settle.mappers.CustomerSettleCheckSheetDetailMapper; import com.lframework.xingyun.settle.service.CustomerSettleCheckSheetDetailService; 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 985e918af2dcbea7f8c296738887d26e3f2b3013..ea319d4ab1bc4df5f51ff5e5e3a6469312355a14 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 @@ -11,17 +11,20 @@ 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.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.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.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.starter.web.core.components.security.AbstractUserDetails; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.entity.SaleReturn; import com.lframework.xingyun.sc.enums.SettleStatus; @@ -51,8 +54,8 @@ import com.lframework.xingyun.settle.vo.check.customer.CustomerSettleCheckSheetI 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.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -109,8 +112,8 @@ public class CustomerSettleCheckSheetServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建客户对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建对账单") + @OpLog(type = SettleOpLogType.class, name = "创建客户对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建对账单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateCustomerSettleCheckSheetVo vo) { @@ -133,8 +136,8 @@ public class CustomerSettleCheckSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = SettleOpLogType.SETTLE, name = "修改客户对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改对账单") + @OpLog(type = SettleOpLogType.class, name = "修改客户对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改对账单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateCustomerSettleCheckSheetVo vo) { @@ -193,8 +196,8 @@ public class CustomerSettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过客户对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = SettleOpLogType.class, name = "审核通过客户对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassCustomerSettleCheckSheetVo vo) { @@ -235,7 +238,7 @@ public class CustomerSettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateCustomerSettleCheckSheetVo vo) { @@ -252,8 +255,8 @@ public class CustomerSettleCheckSheetServiceImpl extends return id; } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝客户对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = SettleOpLogType.class, name = "审核拒绝客户对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseCustomerSettleCheckSheetVo vo) { @@ -294,7 +297,7 @@ public class CustomerSettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户对账单，单号：{}", params = "#code") + @OpLog(type = SettleOpLogType.class, name = "删除客户对账单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetDetailServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetDetailServiceImpl.java index 8c8b20eb707ff9ccd1fee4576409004931c4f343..24505fab7749e3bd9f22e93d223c65b9087ca9b4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetDetailServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.impl; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheetDetail; import com.lframework.xingyun.settle.mappers.CustomerSettleFeeSheetDetailMapper; import com.lframework.xingyun.settle.service.CustomerSettleFeeSheetDetailService; 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 edf8ff2d0082d55b42d0207c4c6dc9ccda4c0e9e..25a05879d1b21e12530a7709acbdf1a948e4eddb 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 @@ -9,17 +9,20 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -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.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.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.starter.web.core.components.security.AbstractUserDetails; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.fee.customer.CustomerSettleFeeSheetFullDto; @@ -41,8 +44,8 @@ import com.lframework.xingyun.settle.vo.fee.customer.CreateCustomerSettleFeeShee 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.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -93,8 +96,8 @@ public class CustomerSettleFeeSheetServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建客户费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建费用单") + @OpLog(type = SettleOpLogType.class, name = "创建客户费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建费用单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateCustomerSettleFeeSheetVo vo) { @@ -116,8 +119,8 @@ public class CustomerSettleFeeSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = SettleOpLogType.SETTLE, name = "修改客户费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改费用单") + @OpLog(type = SettleOpLogType.class, name = "修改客户费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改费用单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateCustomerSettleFeeSheetVo vo) { @@ -165,8 +168,8 @@ public class CustomerSettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过客户费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = SettleOpLogType.class, name = "审核通过客户费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassCustomerSettleFeeSheetVo vo) { @@ -207,7 +210,7 @@ public class CustomerSettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateCustomerSettleFeeSheetVo vo) { @@ -224,8 +227,8 @@ public class CustomerSettleFeeSheetServiceImpl extends return id; } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝客户费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = SettleOpLogType.class, name = "审核拒绝客户费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseCustomerSettleFeeSheetVo vo) { @@ -266,7 +269,7 @@ public class CustomerSettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户费用单，单号：{}", params = "#code") + @OpLog(type = SettleOpLogType.class, name = "删除客户费用单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetDetailServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetDetailServiceImpl.java index bee9c3a06fe46d46641f0da0a83d2bfbdfe016b8..2e5d08e5c6f82de83ba938a5abdcb1163c40197f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetDetailServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.impl; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheetDetail; import com.lframework.xingyun.settle.mappers.CustomerSettlePreSheetDetailMapper; import com.lframework.xingyun.settle.service.CustomerSettlePreSheetDetailService; 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 befef25161c9efa084bc5afafbb1607596a1ad9e..da0a54c0db6e777d87dbf51fa9cfd0a293368ad5 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 @@ -9,16 +9,19 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -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.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.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.starter.web.core.components.security.AbstractUserDetails; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.pre.customer.CustomerSettlePreSheetFullDto; @@ -37,8 +40,8 @@ import com.lframework.xingyun.settle.vo.pre.customer.CreateCustomerSettlePreShee 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.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -86,8 +89,8 @@ public class CustomerSettlePreSheetServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建客户预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建预付款单") + @OpLog(type = SettleOpLogType.class, name = "创建客户预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建预付款单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateCustomerSettlePreSheetVo vo) { @@ -109,8 +112,8 @@ public class CustomerSettlePreSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = SettleOpLogType.SETTLE, name = "修改客户预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改预付款单") + @OpLog(type = SettleOpLogType.class, name = "修改客户预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改预付款单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateCustomerSettlePreSheetVo vo) { @@ -158,8 +161,8 @@ public class CustomerSettlePreSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过客户预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = SettleOpLogType.class, name = "审核通过客户预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassCustomerSettlePreSheetVo vo) { @@ -200,7 +203,7 @@ public class CustomerSettlePreSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateCustomerSettlePreSheetVo vo) { @@ -217,8 +220,8 @@ public class CustomerSettlePreSheetServiceImpl extends return id; } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝客户预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = SettleOpLogType.class, name = "审核拒绝客户预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseCustomerSettlePreSheetVo vo) { @@ -259,7 +262,7 @@ public class CustomerSettlePreSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户预付款单，单号：{}", params = "#code") + @OpLog(type = SettleOpLogType.class, name = "删除客户预付款单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetDetailServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetDetailServiceImpl.java index 83084c0a5972554832a91311c02ad68699a7b16b..f9bbf94dc0afd75c62d3dbf93e8ef3813344a370 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetDetailServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.impl; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.settle.entity.CustomerSettleSheetDetail; import com.lframework.xingyun.settle.mappers.CustomerSettleSheetDetailMapper; import com.lframework.xingyun.settle.service.CustomerSettleSheetDetailService; 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 0c211ed6bffd298c0a99061fe7361a2eb2dc0472..f089e9ebe9cfba6a10ce01bd17dfa3557683d54e 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 @@ -10,16 +10,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.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.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.annotations.OrderTimeLineLog; -import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.starter.web.core.components.security.AbstractUserDetails; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleSheetFullDto; @@ -39,8 +42,8 @@ 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.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -88,8 +91,8 @@ public class CustomerSettleSheetServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建客户结算单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建结算单") + @OpLog(type = SettleOpLogType.class, name = "创建客户结算单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建结算单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateCustomerSettleSheetVo vo) { @@ -111,8 +114,8 @@ public class CustomerSettleSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = SettleOpLogType.SETTLE, name = "修改客户结算单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改结算单") + @OpLog(type = SettleOpLogType.class, name = "修改客户结算单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改结算单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateCustomerSettleSheetVo vo) { @@ -169,8 +172,8 @@ public class CustomerSettleSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过客户结算单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = SettleOpLogType.class, name = "审核通过客户结算单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassCustomerSettleSheetVo vo) { @@ -221,7 +224,7 @@ public class CustomerSettleSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateCustomerSettleSheetVo vo) { @@ -238,8 +241,8 @@ public class CustomerSettleSheetServiceImpl extends return id; } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝客户结算单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = SettleOpLogType.class, name = "审核拒绝客户结算单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseCustomerSettleSheetVo vo) { @@ -279,7 +282,7 @@ public class CustomerSettleSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户结算单，单号：{}", params = "#code") + @OpLog(type = SettleOpLogType.class, name = "删除客户结算单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetDetailServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetDetailServiceImpl.java index e540c35b6155daa3ac9b75be25dee0d1b29f5e46..05899d9d3fc723529468b1fd84b0e302f4011323 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetDetailServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.impl; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.settle.entity.SettleCheckSheetDetail; import com.lframework.xingyun.settle.mappers.SettleCheckSheetDetailMapper; import com.lframework.xingyun.settle.service.SettleCheckSheetDetailService; 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 792971290c0775f62c3dff2c6ab1007af1c40963..5e4e4319b6d29407d619cb384d277fa81646d17a 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 @@ -11,19 +11,22 @@ 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.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.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.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.starter.web.core.components.security.AbstractUserDetails; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.core.utils.OpLogUtil; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.enums.SettleStatus; @@ -109,8 +112,8 @@ public class SettleCheckSheetServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建对账单") + @OpLog(type = SettleOpLogType.class, name = "创建供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建对账单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSettleCheckSheetVo vo) { @@ -132,8 +135,8 @@ public class SettleCheckSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改对账单") + @OpLog(type = SettleOpLogType.class, name = "修改供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改对账单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateSettleCheckSheetVo vo) { @@ -190,8 +193,8 @@ public class SettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = SettleOpLogType.class, name = "审核通过供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassSettleCheckSheetVo vo) { @@ -230,7 +233,7 @@ public class SettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateSettleCheckSheetVo vo) { @@ -247,8 +250,8 @@ public class SettleCheckSheetServiceImpl extends return id; } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = SettleOpLogType.class, name = "审核拒绝供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseSettleCheckSheetVo vo) { @@ -287,7 +290,7 @@ public class SettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商对账单，单号：{}", params = "#code") + @OpLog(type = SettleOpLogType.class, name = "删除供应商对账单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetDetailServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetDetailServiceImpl.java index cf9fb3eceab9604c0cb245a297cf14ac4b1b927f..ecd13357fd68ba335c1740943a35a8f679736185 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetDetailServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.impl; -import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; import com.lframework.xingyun.settle.entity.SettleFeeSheetDetail; import com.lframework.xingyun.settle.mappers.SettleFeeSheetDetailMapper; import com.lframework.xingyun.settle.service.SettleFeeSheetDetailService; 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 4014f5f783b4e40cd8593a3f2f5e3cef79a9a3e8..8be9e8a6c008f6229dd0a7578d98e215837f4e25 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 @@ -9,19 +9,22 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -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.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.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.starter.web.core.components.security.AbstractUserDetails; +import com.lframework.starter.web.core.components.security.SecurityUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.EnumUtil; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.core.annotations.timeline.OrderTimeLineLog; +import com.lframework.starter.web.inner.components.timeline.ApprovePassOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.ApproveReturnOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.CreateOrderTimeLineBizType; +import com.lframework.starter.web.inner.components.timeline.UpdateOrderTimeLineBizType; +import com.lframework.starter.web.inner.service.GenerateCodeService; +import com.lframework.starter.web.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; @@ -93,8 +96,8 @@ public class SettleFeeSheetServiceImpl extends return getBaseMapper().getDetail(id); } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建费用单") + @OpLog(type = SettleOpLogType.class, name = "创建供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = CreateOrderTimeLineBizType.class, orderId = "#_result", name = "创建费用单") @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSettleFeeSheetVo vo) { @@ -116,8 +119,8 @@ public class SettleFeeSheetServiceImpl extends return sheet.getId(); } - @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改费用单") + @OpLog(type = SettleOpLogType.class, name = "修改供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = UpdateOrderTimeLineBizType.class, orderId = "#vo.id", name = "修改费用单") @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateSettleFeeSheetVo vo) { @@ -163,8 +166,8 @@ public class SettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @OpLog(type = SettleOpLogType.class, name = "审核通过供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核通过") @Transactional(rollbackFor = Exception.class) @Override public void approvePass(ApprovePassSettleFeeSheetVo vo) { @@ -203,7 +206,7 @@ public class SettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @OrderTimeLineLog(type = ApprovePassOrderTimeLineBizType.class, orderId = "#_result", name = "直接审核通过") @Transactional(rollbackFor = Exception.class) @Override public String directApprovePass(CreateSettleFeeSheetVo vo) { @@ -220,8 +223,8 @@ public class SettleFeeSheetServiceImpl extends return id; } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @OpLog(type = SettleOpLogType.class, name = "审核拒绝供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = ApproveReturnOrderTimeLineBizType.class, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") @Transactional(rollbackFor = Exception.class) @Override public void approveRefuse(ApproveRefuseSettleFeeSheetVo vo) { @@ -260,7 +263,7 @@ public class SettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商费用单，单号：{}", params = "#code") + @OpLog(type = SettleOpLogType.class, name = "删除供应商费用单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @Override 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 06de78b0f2e103dcff91e59027aa80c034477081..d5a31690f5e4b43b2b4a5bc3cfb98e9ecf7801ff 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 @@ -7,14 +7,13 @@ 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.IdUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.starter.web.core.impl.BaseMpServiceImpl; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.utils.IdUtil; +import com.lframework.starter.web.core.utils.PageHelperUtil; +import com.lframework.starter.web.core.utils.PageResultUtil; import com.lframework.xingyun.settle.entity.SettleInItem; import com.lframework.xingyun.settle.enums.SettleOpLogType; import com.lframework.xingyun.settle.mappers.SettleInItemMapper; @@ -23,10 +22,9 @@ 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.core.annotations.OpLog; -import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.starter.web.core.annotations.oplog.OpLog; +import com.lframework.starter.web.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; @@ -74,7 +72,7 @@ public class SettleInItemServiceImpl extends BaseMpServiceImpl query(@Param("vo") QueryCustomerSettleCheckSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetDetailMapper.java index 5a6a517794cade181f8ba3fd190a4a523b08bf30..b1d211520fbac8a08911737668893ece1a9006c8 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetMapper.java index 028fc951ecc74a43f8cdc90dbf4e2b7de9092c71..9f124abd2aaad3ce40462c6802ffa6e4ddba3eb3 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleFeeSheetMapper.java @@ -1,15 +1,15 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.fee.customer.CustomerSettleFeeSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; import com.lframework.xingyun.settle.vo.fee.customer.QueryCustomerSettleFeeSheetVo; -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.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -35,7 +35,7 @@ public interface CustomerSettleFeeSheetMapper extends BaseMapper query(@Param("vo") QueryCustomerSettleFeeSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetDetailMapper.java index 42d733fa2472dc41e1d7d973f47ecb4e64ff7b2f..c13df19df73b628b810846952999542fc1e6591b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetMapper.java index 2c6ccbf84fc3db89a9816cd38bf213a47c1e5109..5e8c7fd0bd3d5f793fabf4e4c18cd0317c55ada5 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettlePreSheetMapper.java @@ -1,15 +1,15 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.pre.customer.CustomerSettlePreSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; import com.lframework.xingyun.settle.vo.pre.customer.QueryCustomerSettlePreSheetVo; -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.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -35,7 +35,7 @@ public interface CustomerSettlePreSheetMapper extends BaseMapper query(@Param("vo") QueryCustomerSettlePreSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetDetailMapper.java index f3dd876cf416d7669bbbb60da17e30e798baebe6..1c7ca60e39fa5b432a91e8a21a4edf3854d8272c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.CustomerSettleSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetMapper.java index cf6f306412a8c47562e1c1ddb234dd5d6b6daff5..e574bda4dda5d548651684282adbe37c7f61c3bd 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/CustomerSettleSheetMapper.java @@ -1,14 +1,14 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettleSheet; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerSettleSheetVo; -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; @@ -33,7 +33,7 @@ public interface CustomerSettleSheetMapper extends BaseMapper query(@Param("vo") QueryCustomerSettleSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetDetailMapper.java index d78755b4b8557879da7af4dec9445ef7da98071b..5db1055bebc9014449605e0c7ae69f92c8a84450 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.SettleCheckSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetMapper.java index 9767ff710ea2c4a2c6e2fc9d1c31a584a8dac2f7..95837fd3f08b8ab177450de604e64c3768f59d83 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleCheckSheetMapper.java @@ -1,18 +1,17 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.settle.dto.check.SettleCheckSheetFullDto; import com.lframework.xingyun.settle.entity.SettleCheckSheet; import com.lframework.xingyun.settle.vo.check.QuerySettleCheckSheetVo; -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 org.apache.ibatis.annotations.Param; - import java.time.LocalDateTime; import java.util.List; +import org.apache.ibatis.annotations.Param; /** *

@@ -35,7 +34,7 @@ public interface SettleCheckSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "s", autoParse = true), @Sort(value = "approveTime", alias = "s", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List query(@Param("vo") QuerySettleCheckSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetDetailMapper.java index 7109be8405b63cf7e3354f6cc3e64dc329be9309..22a0442c6cada3584408ba4e3b7cf84d8a26d50c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.SettleFeeSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetMapper.java index 0a81c61a98f549a90a6de3b1b61f6721a8fc9659..d902fefe7c526bc53d3ab33fda666355b5f9dc65 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleFeeSheetMapper.java @@ -1,19 +1,18 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.fee.SettleFeeSheetFullDto; import com.lframework.xingyun.settle.entity.SettleFeeSheet; import com.lframework.xingyun.settle.vo.fee.QuerySettleFeeSheetVo; -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 org.apache.ibatis.annotations.Param; - import java.time.LocalDateTime; import java.util.List; +import org.apache.ibatis.annotations.Param; /** *

@@ -36,7 +35,7 @@ public interface SettleFeeSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "s", autoParse = true), @Sort(value = "approveTime", alias = "s", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List query(@Param("vo") QuerySettleFeeSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleInItemMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleInItemMapper.java index 1b239f558965424db30bb5bd1881251084c89eb3..c083b68bdbc26980de967f873caa99147fe3964a 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleInItemMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleInItemMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.SettleInItem; import com.lframework.xingyun.settle.vo.item.in.QuerySettleInItemVo; import com.lframework.xingyun.settle.vo.item.in.SettleInItemSelectorVo; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleOutItemMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleOutItemMapper.java index d216516f67c4cbaa1001ee5dd597d3e95f87f521..1f2995387f2f9010452434f08175e45b599cd0a7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleOutItemMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleOutItemMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.SettleOutItem; import com.lframework.xingyun.settle.vo.item.out.QuerySettleOutItemVo; import com.lframework.xingyun.settle.vo.item.out.SettleOutItemSelectorVo; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetDetailMapper.java index 4d25008069f9d1f1be2e5ad578e35d5ba9554d73..4ae7375b4ba3f5c159c3b1a6c630c29735f079a4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.SettlePreSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetMapper.java index fad0b73f5e546900321585aff71c79f9e5436dda..3a25a4bdbab53f7d8a59c0112f85aa503240bdb4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettlePreSheetMapper.java @@ -1,19 +1,18 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.pre.SettlePreSheetFullDto; import com.lframework.xingyun.settle.entity.SettlePreSheet; import com.lframework.xingyun.settle.vo.pre.QuerySettlePreSheetVo; -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 org.apache.ibatis.annotations.Param; - import java.time.LocalDateTime; import java.util.List; +import org.apache.ibatis.annotations.Param; /** *

@@ -36,7 +35,7 @@ public interface SettlePreSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "s", autoParse = true), @Sort(value = "approveTime", alias = "s", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List query(@Param("vo") QuerySettlePreSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetDetailMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetDetailMapper.java index b98472bebf4486d6ea19de880c6a16c57d670bcd..5150405d628814e6d8087602ed8372b3408542f5 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetDetailMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetDetailMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; import com.lframework.xingyun.settle.entity.SettleSheetDetail; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetMapper.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetMapper.java index 8a852f1b6d26d8475d7ac0d3a495e44b02bbe5a7..41b6497802145a8e92c91e3e541a22d89d533286 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetMapper.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/mappers/SettleSheetMapper.java @@ -1,17 +1,16 @@ package com.lframework.xingyun.settle.mappers; -import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.starter.web.core.mapper.BaseMapper; +import com.lframework.starter.web.core.annotations.permission.DataPermission; +import com.lframework.starter.web.core.annotations.permission.DataPermissions; +import com.lframework.starter.web.core.annotations.sort.Sort; +import com.lframework.starter.web.core.annotations.sort.Sorts; +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType; import com.lframework.xingyun.settle.dto.sheet.SettleSheetFullDto; import com.lframework.xingyun.settle.entity.SettleSheet; import com.lframework.xingyun.settle.vo.sheet.QuerySettleSheetVo; -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 org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; /** *

@@ -34,7 +33,7 @@ public interface SettleSheetMapper extends BaseMapper { @Sort(value = "createTime", alias = "s", autoParse = true), @Sort(value = "approveTime", alias = "s", autoParse = true), }) - @DataPermissions(type = SysDataPermissionDataPermissionType.ORDER, value = { + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { @DataPermission(template = "order", alias = "s") }) List query(@Param("vo") QuerySettleSheetVo vo); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetDetailService.java index 92a1c1f7a23b53158d92a35d78b36de2b528ece7..6a9d4fd5e1ad2ec5144775c2f058be01f7bc1f68 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheetDetail; public interface CustomerSettleCheckSheetDetailService extends diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetService.java index e08c726f4d4b8e5e649635b0f41d049cb961f717..a62801bb20d9f1b84aea1a14054b643eac95390b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleCheckSheetService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.dto.check.customer.CustomerSettleCheckBizItemDto; import com.lframework.xingyun.settle.dto.check.customer.CustomerSettleCheckSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetDetailService.java index 304c19e43532681b6ec3977005c9785fe4b33fb4..22d5f6ec072ee97a7e52bf04d6820ef0a2962379 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheetDetail; public interface CustomerSettleFeeSheetDetailService extends 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 f9fb8c227d815350259bdd52f681f80af374aacd..3c9484092f99d568d3397296bf6f9d09f7b7fa34 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.fee.customer.CustomerSettleFeeSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetDetailService.java index 914385452f532067066e91fb8af5ed65d2f6b87a..ad605cb2f78d7c32ca0f1c8cb49f67fcbd75501f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheetDetail; public interface CustomerSettlePreSheetDetailService extends 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 4cf63d28425275c1d37823f6e5806826fb7178a0..137fdcb18d3b52a2a8e8378ea54752810b54f545 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.pre.customer.CustomerSettlePreSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetDetailService.java index 1da977cddec6afd81810f4f30dd3f9a5d9129602..3c8e579f6043a8f34f624eedc20e06194be5a9c2 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.CustomerSettleSheetDetail; public interface CustomerSettleSheetDetailService extends 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 0cd81d3c233d541ee9029bf674457ab55680597d..56058dde632865a31f4e74ce0ba9ed789552bb74 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleSheetFullDto; import com.lframework.xingyun.settle.entity.CustomerSettleSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetDetailService.java index 8abf17e86cae6f75fe979cb1aaec7bdf661b6c76..92eacb620378d1467c68880a5608588836a7e38c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.SettleCheckSheetDetail; public interface SettleCheckSheetDetailService extends BaseMpService { 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 03029db198f97744bfafd454b3c1ccc453020214..1607ac87fcd54eee2d5e57e25e05d9632f78bd13 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.dto.check.SettleCheckBizItemDto; import com.lframework.xingyun.settle.dto.check.SettleCheckSheetFullDto; import com.lframework.xingyun.settle.entity.SettleCheckSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetDetailService.java index 0b4bf03ad8b2d5e1ad7a47c2ec88aa6f3d5dd4c0..bf007cd252c06a6eee8aae20f03ca9fa856be1b4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.SettleFeeSheetDetail; public interface SettleFeeSheetDetailService extends BaseMpService { 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 8218ad9f6f11fbfcc1592eae3eb1c0c9f3294b9f..d8fe9b12a11b414b03aeaba1db1bf6d0330b9ca6 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.fee.SettleFeeSheetFullDto; import com.lframework.xingyun.settle.entity.SettleFeeSheet; 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 268130b1c05938450da9d4d179c6ecc43aa76240..5b0f85748d730a989d13db01396c89f077ed8256 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 @@ -1,14 +1,13 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.SettleInItem; 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 java.util.Collection; import java.util.List; public interface SettleInItemService extends BaseMpService { 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 e70a302291469e1278ec798d9dfae8f72f155523..7cb5d31602ed2a00b4576a49b843c50300d4dba7 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 @@ -1,14 +1,13 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.SettleOutItem; 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 java.util.Collection; import java.util.List; public interface SettleOutItemService extends BaseMpService { diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetDetailService.java index e39716269923b57a923e72e03c516e78203df351..a2258d39a7ac0c67e16210bbd720172c16668454 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.SettlePreSheetDetail; public interface SettlePreSheetDetailService extends BaseMpService { 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 128cdc31daf35143c66d51ee02643f15db222bca..0a56d5479cf41e5d0a46a6e574642a10ff5876d4 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.dto.pre.SettlePreSheetFullDto; import com.lframework.xingyun.settle.entity.SettlePreSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetDetailService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetDetailService.java index a0ed86ff93ffe130d26dc547e23a959e7ac6cf6a..86d05dcb003a46c5b745bb4bd61e031e6c1f43a3 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetDetailService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetDetailService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.entity.SettleSheetDetail; public interface SettleSheetDetailService extends BaseMpService { 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 2d060272c4812b6511576d4a38dcc34448477e85..a722e9384e60f83fd7e15d0763da50e861b7afca 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 @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.service; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; +import com.lframework.starter.web.core.components.resp.PageResult; +import com.lframework.starter.web.core.service.BaseMpService; import com.lframework.xingyun.settle.dto.sheet.SettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.SettleSheetFullDto; import com.lframework.xingyun.settle.entity.SettleSheet; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApprovePassSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApprovePassSettleCheckSheetVo.java index f0a354e9e5d302bb8a01ab4a8c2e667c73860de0..32e4121ba99844e4ce924aead4a0034c305ac7f6 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApprovePassSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApprovePassSettleCheckSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.check; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApproveRefuseSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApproveRefuseSettleCheckSheetVo.java index 11bc8de8b3daa849d954ff065ae51a48beca59cd..664cf75673e6a90bf569a43609a499b964deab80 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApproveRefuseSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/ApproveRefuseSettleCheckSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.check; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/CreateSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/CreateSettleCheckSheetVo.java index 49593f4962afe9c573291e9b428907a64aee0473..40af821a87195d26e1a8a71c4134e9bfb8771fb4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/CreateSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/CreateSettleCheckSheetVo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.vo.check; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QuerySettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QuerySettleCheckSheetVo.java index 943eec352ebc7870113323489006f99bc824cfb0..f87ff492ecc5bff02586682416e365a97daa06ab 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QuerySettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QuerySettleCheckSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.check; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettleCheckSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QueryUnCheckBizItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QueryUnCheckBizItemVo.java index 974078802f9d6ab347dcea15bf58368e490cc34c..19207784901e2a8bf56be33ed88d27bf5562f101 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QueryUnCheckBizItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/QueryUnCheckBizItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.check; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/SettleCheckSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/SettleCheckSheetItemVo.java index 17940732559341c6c1deb01e1937c74db9e51eb9..477a7d96160ba9534380dfff654c921a780be8f9 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/SettleCheckSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/SettleCheckSheetItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.check; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.settle.enums.SettleCheckSheetBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApprovePassCustomerSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApprovePassCustomerSettleCheckSheetVo.java index ba7268e00d6a85ed7fc618736a54539b93705e34..c85855ab9a321e2844a43d5087ea4c5d5368780e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApprovePassCustomerSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApprovePassCustomerSettleCheckSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.check.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApproveRefuseCustomerSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApproveRefuseCustomerSettleCheckSheetVo.java index 429a54931d7294783c899e425680f4588ea7ae57..d48dbbf92ee29a4565869e709b2ac1bcad75113b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApproveRefuseCustomerSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/ApproveRefuseCustomerSettleCheckSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.check.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CreateCustomerSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CreateCustomerSettleCheckSheetVo.java index 0728040a75f4bd7f113a10b9517630cb02db4532..85c815bd1e8cc0f4d0eec851a5adb90fed1e2948 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CreateCustomerSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CreateCustomerSettleCheckSheetVo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.vo.check.customer; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CustomerSettleCheckSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CustomerSettleCheckSheetItemVo.java index 51780c5fe801f05e498e058b6518cca42818e638..8aca38df1dbde2978ef956f0d1d2f18f415e9d47 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CustomerSettleCheckSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/CustomerSettleCheckSheetItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.check.customer; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerSettleCheckSheetVo.java index ba480e4a95da01974702b812b9649bcddad7dc14..c8118f9b96cb37723ce6671639792ce60bdd98ea 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerSettleCheckSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerSettleCheckSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.check.customer; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerUnCheckBizItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerUnCheckBizItemVo.java index 6ac7b55bbd74f83ac211d2829d6be5fbf7a763d8..c656f82403f225ad0a7c4a85c4002a150c1dc50e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerUnCheckBizItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/QueryCustomerUnCheckBizItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.check.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApprovePassSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApprovePassSettleFeeSheetVo.java index f8f59c0ac7fec8e2339d7f21925c5d6783ad654f..be482ad11db5db8fad5c967455d03796dd4e0789 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApprovePassSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApprovePassSettleFeeSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.fee; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApproveRefuseSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApproveRefuseSettleFeeSheetVo.java index 93e29e1c7ca3e1a7118e2b6b380f93506e821f96..803002eb7d58d6c641c8ee54d072aa64c35142bd 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApproveRefuseSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/ApproveRefuseSettleFeeSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.fee; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/CreateSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/CreateSettleFeeSheetVo.java index e47cc350bd63e8dcaf1011b7fccdface61530152..b1ebac6b95175ca63d0374f94a02459d4ee3e2a2 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/CreateSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/CreateSettleFeeSheetVo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.vo.fee; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.settle.enums.SettleFeeSheetType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/QuerySettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/QuerySettleFeeSheetVo.java index b898cd1582da3d3e1fe266a3d1394b5e6858341d..d902e22c44887d85010b6d46f1e0ccd339d60495 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/QuerySettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/QuerySettleFeeSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.fee; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettleFeeSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/SettleFeeSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/SettleFeeSheetItemVo.java index b5d4ae06abbb094cdcc26be657e106430ebeb665..810eaaff0bf90a16207774681101855bffcc6456 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/SettleFeeSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/SettleFeeSheetItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.fee; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApprovePassCustomerSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApprovePassCustomerSettleFeeSheetVo.java index c6be005f47e9317050dd97adbb8d578c39dc5c7a..ffc18161b3cd1e6b4c99b0dceecf99bf6e6e907b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApprovePassCustomerSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApprovePassCustomerSettleFeeSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.fee.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApproveRefuseCustomerSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApproveRefuseCustomerSettleFeeSheetVo.java index 936c5aa7d4c44b34c7f8fce61bef088ac3bbf285..306d5c352aec330f0a4584d7b202a8dbd9af6905 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApproveRefuseCustomerSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/ApproveRefuseCustomerSettleFeeSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.fee.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CreateCustomerSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CreateCustomerSettleFeeSheetVo.java index a3a8b760c4738a14340779dc69dd7b3cdc5a3668..a297a80425b1e3663694cde90cc62bc9a6e82bac 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CreateCustomerSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CreateCustomerSettleFeeSheetVo.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.settle.vo.fee.customer; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.BaseVo; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CustomerSettleFeeSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CustomerSettleFeeSheetItemVo.java index 37309900bf35fe4cb3f4550c50b4ac2f272b9d89..e4a338f16a3bf3d01c6edec11a955c00db911a61 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CustomerSettleFeeSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/CustomerSettleFeeSheetItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.fee.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/QueryCustomerSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/QueryCustomerSettleFeeSheetVo.java index d8ec9adc90f4b94d59fb00e45d7f461d2e25566d..c7d3b38c3e3f83c861fdba020b166be56a2a8492 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/QueryCustomerSettleFeeSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/QueryCustomerSettleFeeSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.fee.customer; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/CreateSettleInItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/CreateSettleInItemVo.java index d7797ee4c7493c1399681c0c2764efbc49ca8eb1..cac162474a38d8d79421538c8ebfc4777f6a3c99 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/CreateSettleInItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/CreateSettleInItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.in; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/QuerySettleInItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/QuerySettleInItemVo.java index f44fddb8950ce1bf65d16ef9d768cb5e93e555ce..cf0a0d36a2246f36084660e5d831e697bd2bf10c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/QuerySettleInItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/QuerySettleInItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.in; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/SettleInItemSelectorVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/SettleInItemSelectorVo.java index 9f44ca00d9219b704fb6bc194586c140d4666bb4..b2a787d03edf9af029ead68fdae9be9ee067c9ab 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/SettleInItemSelectorVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/SettleInItemSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.in; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/UpdateSettleInItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/UpdateSettleInItemVo.java index 00bc42bb3fd5dc0ead7372e015a17ad89d1a8c49..e7b8a1b75921585e409140f464387ca646f6cb49 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/UpdateSettleInItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/in/UpdateSettleInItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.in; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/CreateSettleOutItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/CreateSettleOutItemVo.java index 9658b56e64f1cf86e3b6ccdedb25a4403f9037c4..74ea6502fb66bf51a36aca589b117e3fab7ced98 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/CreateSettleOutItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/CreateSettleOutItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.out; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/QuerySettleOutItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/QuerySettleOutItemVo.java index b27717f4fc7a4e8302eafc14d910bd38c4c26353..41b4e60b69277485210c2d0516e11fb45411c441 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/QuerySettleOutItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/QuerySettleOutItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.out; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/SettleOutItemSelectorVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/SettleOutItemSelectorVo.java index f019142000652caa9e254ca6bd83851cfec05d5b..8b7b44aa9c5a99b2b68caf3ec03b0328ed2f195f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/SettleOutItemSelectorVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/SettleOutItemSelectorVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.out; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.vo.BaseVo; +import com.lframework.starter.web.core.vo.PageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import lombok.Data; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/UpdateSettleOutItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/UpdateSettleOutItemVo.java index 3becb1c20597158efe33c51b86aa514cd7885b1d..ea9e5af88a10e4ae4766f99285a3ff1c041ad561 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/UpdateSettleOutItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/item/out/UpdateSettleOutItemVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.item.out; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.components.validation.IsCode; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApprovePassSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApprovePassSettlePreSheetVo.java index f5de560eda0ed989a0927875777ea6500652852f..9a932ccb5ff48cc282d5b9b4a3387a1074794d33 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApprovePassSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApprovePassSettlePreSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.pre; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApproveRefuseSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApproveRefuseSettlePreSheetVo.java index d96f83c284741dfdc11bded7a232f91dcb2187a0..8933bd4f43827d1bae91fbcb247995b9349a3847 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApproveRefuseSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/ApproveRefuseSettlePreSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.pre; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/CreateSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/CreateSettlePreSheetVo.java index 18d077748015e456cd5a2e069cf6716140fac7b5..e16792fcd3fd28b01ab596f041c5e846c564ead6 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/CreateSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/CreateSettlePreSheetVo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.settle.vo.pre; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/QuerySettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/QuerySettlePreSheetVo.java index 74f9557ccd7dd96ad786de499ae170cef59856d1..f89dac541235e41928076d9e3324847ea122cccd 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/QuerySettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/QuerySettlePreSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.pre; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.SortPageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.SortPageVo; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.SettlePreSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/SettlePreSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/SettlePreSheetItemVo.java index 90e0ded7709e2a8fc44b3441d397971f3c5bbdd0..1da18591a547ed77784a4da1db992f363bcbefe6 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/SettlePreSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/SettlePreSheetItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.pre; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApprovePassCustomerSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApprovePassCustomerSettlePreSheetVo.java index 127354ba8d1eaf74505b967d79f337d0d49436b6..bdf64923b64ca6eff983730d738029e2cdf32bae 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApprovePassCustomerSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApprovePassCustomerSettlePreSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.pre.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApproveRefuseCustomerSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApproveRefuseCustomerSettlePreSheetVo.java index d8f6c15633f9df03cec5c4832cdfcc904501858a..9823c24c6db1e3d4c8c85236c29bd7b80499c96c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApproveRefuseCustomerSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/ApproveRefuseCustomerSettlePreSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.pre.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CreateCustomerSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CreateCustomerSettlePreSheetVo.java index 4279c39dc9497fb4bf4c14d800ebebd61bfbb006..2486430f5f166ae39adc0214d367a7d8381c375d 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CreateCustomerSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CreateCustomerSettlePreSheetVo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.settle.vo.pre.customer; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CustomerSettlePreSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CustomerSettlePreSheetItemVo.java index 2843780b2d88aee3818e4a87c4817b6abd46b2df..286c405366784a297a913c8be0c00e6c8a5cec13 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CustomerSettlePreSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/CustomerSettlePreSheetItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.pre.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/QueryCustomerSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/QueryCustomerSettlePreSheetVo.java index e8b7ab1330586e69fe383cabb916166c89ae06f8..ccfd35613bf3a44085316ca2b43c0f27ef0baa88 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/QueryCustomerSettlePreSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/QueryCustomerSettlePreSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.pre.customer; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.enums.CustomerSettlePreSheetStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApprovePassSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApprovePassSettleSheetVo.java index 809ad98cee15134a36aa69ecc8f7930e714a79f3..f82c4fc5a1c34e3bdc90a1a420644ba4221e486b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApprovePassSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApprovePassSettleSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApproveRefuseSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApproveRefuseSettleSheetVo.java index 13f5d4967fb03b30d244fb299931b24d92615d2c..52173d416d8be4428bf4e4f4c0176b251e7573cd 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApproveRefuseSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/ApproveRefuseSettleSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/CreateSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/CreateSettleSheetVo.java index 3703b560eac418e1ad1a5604720b6b0329a3a7c9..4b52b1666ffc701c873b012f35631853e74d94f8 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/CreateSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/CreateSettleSheetVo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.vo.sheet; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QuerySettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QuerySettleSheetVo.java index cfa73c85884dda225819e703811d54d048f9a385..600f5409e9374d7d99e9ebfb49e1531e41dcd72c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QuerySettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QuerySettleSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.sheet; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.settle.enums.SettleSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QueryUnSettleBizItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QueryUnSettleBizItemVo.java index e771f1b157f7fffc9d95129b3f019d479836fcf0..fadee1d1ae6b2f22ef945e2b08dbe24b61905d31 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QueryUnSettleBizItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/QueryUnSettleBizItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/SettleSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/SettleSheetItemVo.java index 312f7e955ad1fff3808d65fa884cbc3c441f1489..c2287131f12c764ec38ebee969370005eeec259c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/SettleSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/SettleSheetItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApprovePassCustomerSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApprovePassCustomerSettleSheetVo.java index 73990d0011c3dd0219187c343073abe214127fa8..dc7cc00b4f5edd78fc1e95d7feaed06683e303c9 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApprovePassCustomerSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApprovePassCustomerSettleSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotNull; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApproveRefuseCustomerSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApproveRefuseCustomerSettleSheetVo.java index 1407de290187d1d3a539c127a964aabd53853092..f6091fc3b521d05b23bb7c7bca68f96284b46d52 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApproveRefuseCustomerSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/ApproveRefuseCustomerSettleSheetVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.NotBlank; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CreateCustomerSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CreateCustomerSettleSheetVo.java index e5d7866afe5d4e040ab906b3bd9d555d91f55086..405f72df5e74cd5c59952945e1cb269fc80f6c62 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CreateCustomerSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CreateCustomerSettleSheetVo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.settle.vo.sheet.customer; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CustomerSettleSheetItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CustomerSettleSheetItemVo.java index fb52b4cbda1a24495da6728303611c4af58af314..5e3b2941eaef6f74a2783f6b1aa30dc64f6e7074 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CustomerSettleSheetItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/CustomerSettleSheetItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerSettleSheetVo.java index a77554f160137244c44505e1ce0dcf6ccc310a48..c692dcbc3ae7dd92938b88b348b5aad5b80a75c8 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerSettleSheetVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerSettleSheetVo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.settle.vo.sheet.customer; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; +import com.lframework.starter.web.core.components.validation.IsEnum; +import com.lframework.starter.web.core.vo.PageVo; import com.lframework.xingyun.settle.enums.CustomerSettleSheetStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerUnSettleBizItemVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerUnSettleBizItemVo.java index 0eec7e874614fb37c9abbbc72478a60a302c08e1..dac7262c16845eceb84146f52d25b04050515da4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerUnSettleBizItemVo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/QueryCustomerUnSettleBizItemVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.settle.vo.sheet.customer; -import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.core.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/xingyun-sys/pom.xml b/xingyun-sys/pom.xml deleted file mode 100644 index a0533dffb67aa6c4a5a1833c22db3b1e7ab33a98..0000000000000000000000000000000000000000 --- a/xingyun-sys/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - xingyun - com.lframework - 1.0.0-SNAPSHOT - - 4.0.0 - - xingyun-sys - - 【${project.artifactId}】此Module与业务无关，提供用户、角色、部门等基础接口 - - - - com.lframework - xingyun-core - - - com.lframework - websocket-starter - - - org.freemarker - freemarker - - - org.ssssssss - magic-api-spring-boot-starter - - - org.ssssssss - magic-api-plugin-cluster - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java deleted file mode 100644 index 4cd982e52f30f16ac15dc83699769b69844b17d5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.config; - -import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; - -@Configuration -public class TemplateApiConfiguration { - - @Bean("templateApiDocket") - public Docket securityAPiDocket(ApiInfo info, OpenApiExtensionResolver openApiExtensionResolver) { - - // 除了描述 其他全与info保持一致 - ApiInfo apiInfo = new ApiInfo(info.getTitle(), "系统内置模块", info.getVersion(), - info.getTermsOfServiceUrl(), - info.getContact(), info.getLicense(), info.getLicenseUrl(), info.getVendorExtensions()); - - Docket docket = new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo).groupName("系统内置模块") - .select() - .apis(RequestHandlerSelectors.basePackage("com.lframework.xingyun.template")) - .paths(PathSelectors.any()) - .build() - .extensions(openApiExtensionResolver.buildSettingExtensions()); - return docket; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3eed7242b90b839ea4fe29ea2eeb0c6a7a7ea750..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.list; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomListSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 数据对象ID - */ - @ApiModelProperty("数据对象ID") - private String dataObjId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - public GenCustomListSelectorBo() { - } - - public GenCustomListSelectorBo(GenCustomList dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomList dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomListCategoryService genCustomListCategoryService = ApplicationUtil.getBean( - GenCustomListCategoryService.class); - GenCustomListCategory category = genCustomListCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4b6c2ea549ed32ce71d190ab5eec3581c3b79553..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java +++ /dev/null @@ -1,500 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.list; - -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.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; -import com.lframework.xingyun.template.gen.entity.GenCustomListHandleColumn; -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.xingyun.template.gen.entity.GenCustomListToolbar; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.service.GenCustomListCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomListDetailService; -import com.lframework.xingyun.template.gen.service.GenCustomListHandleColumnService; -import com.lframework.xingyun.template.gen.service.GenCustomListQueryParamsService; -import com.lframework.xingyun.template.gen.service.GenCustomListToolbarService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.stream.Collectors; -import lombok.Data; - -@Data -public class GetGenCustomListBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 数据对象ID - */ - @ApiModelProperty("数据对象ID") - private String dataObjId; - - /** - * 列表类型 - */ - @ApiModelProperty("列表类型") - private Integer listType; - - /** - * 数据对象名称 - */ - @ApiModelProperty("数据对象名称") - private String dataObjName; - - /** - * 表单Label宽度 - */ - @ApiModelProperty("表单Label宽度") - private Integer labelWidth; - - /** - * 是否分页 - */ - @ApiModelProperty("是否分页") - private Boolean hasPage; - - /** - * 是否树形列表 - */ - @ApiModelProperty("是否树形列表") - private Boolean treeData; - - /** - * ID字段 - */ - @ApiModelProperty("ID字段") - private String idColumn; - - /** - * 父级ID字段 - */ - @ApiModelProperty("父级ID字段") - private String treePidColumn; - - /** - * 树形节点字段 - */ - @ApiModelProperty("树形节点字段") - private String treeNodeColumn; - - /** - * 子节点Key值 - */ - @ApiModelProperty("子节点Key值") - private String treeChildrenKey; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 查询前置SQL - */ - @ApiModelProperty("查询前置SQL") - private String queryPrefixSql; - - /** - * 查询后置SQL - */ - @ApiModelProperty("查询后置SQL") - private String querySuffixSql; - - /** - * 后置SQL - */ - @ApiModelProperty("后置SQL") - private String suffixSql; - - /** - * 是否允许导出 - */ - @ApiModelProperty("是否允许导出") - private Boolean allowExport; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 工具栏 - */ - @ApiModelProperty("工具栏") - private List toolbars; - - /** - * 操作列 - */ - @ApiModelProperty("操作列") - private List handleColumns; - - /** - * 查询条件 - */ - @ApiModelProperty("查询条件") - private List queryParams; - - /** - * 详情 - */ - @ApiModelProperty("详情") - private List details; - - public GetGenCustomListBo() { - } - - public GetGenCustomListBo(GenCustomList dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomList dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomListCategoryService genCustomListCategoryService = ApplicationUtil.getBean( - GenCustomListCategoryService.class); - GenCustomListCategory category = genCustomListCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - - this.listType = dto.getListType().getCode(); - - GenDataEntityDetailService genDataEntityDetailService = ApplicationUtil - .getBean(GenDataEntityDetailService.class); - GenDataObjService genDataObjService = ApplicationUtil.getBean(GenDataObjService.class); - GenDataObj dataObj = genDataObjService.findById(dto.getDataObjId()); - this.dataObjName = dataObj.getName(); - - GenCustomListQueryParamsService genCustomListQueryParamsService = ApplicationUtil.getBean( - GenCustomListQueryParamsService.class); - List queryParams = genCustomListQueryParamsService.getByCustomListId( - dto.getId()); - if (!CollectionUtil.isEmpty(queryParams)) { - this.queryParams = queryParams.stream().map(t -> { - GenDataEntityDetail entityDetail = genDataEntityDetailService.getById(t.getDataEntityId()); - QueryParamsBo bo = new QueryParamsBo(); - bo.setId(t.getDataEntityId()); - bo.setRelaId(t.getRelaId()); - bo.setFrontShow(t.getFrontShow()); - bo.setQueryType(t.getQueryType().getCode()); - bo.setFormWidth(t.getFormWidth()); - bo.setDefaultValue(t.getDefaultValue()); - bo.setType(t.getType().getCode()); - bo.setDataType(entityDetail.getDataType().getCode()); - bo.setViewType(entityDetail.getViewType().getCode()); - - return bo; - }).collect(Collectors.toList()); - } - - GenCustomListDetailService genCustomListDetailService = ApplicationUtil.getBean( - GenCustomListDetailService.class); - List details = genCustomListDetailService.getByCustomListId(dto.getId()); - this.details = details.stream().map(t -> { - DetailBo bo = new DetailBo(); - bo.setId(t.getDataEntityId()); - bo.setRelaId(t.getRelaId()); - bo.setWidthType(t.getWidthType().getCode()); - bo.setSortable(t.getSortable()); - bo.setWidth(t.getWidth()); - bo.setType(t.getType().getCode()); - if (t.getType() == GenCustomListDetailType.CUSTOM) { - bo.setId(t.getRelaId()); - } - bo.setFormatter(t.getFormatter()); - - return bo; - }).collect(Collectors.toList()); - - GenCustomListToolbarService genCustomListToolbarService = ApplicationUtil - .getBean(GenCustomListToolbarService.class); - List toolbars = genCustomListToolbarService - .getByCustomListId(dto.getId()); - - this.toolbars = toolbars.stream().map(t -> { - ToolbarBo toolbar = new ToolbarBo(); - toolbar.setId(t.getId()); - toolbar.setName(t.getName()); - toolbar.setViewType(t.getViewType().getCode()); - toolbar.setBtnType(t.getBtnType().getCode()); - toolbar.setBtnConfig(t.getBtnConfig()); - toolbar.setIcon(t.getIcon()); - return toolbar; - }).collect(Collectors.toList()); - - GenCustomListHandleColumnService genCustomListHandleColumnService = ApplicationUtil - .getBean(GenCustomListHandleColumnService.class); - List handleColumns = genCustomListHandleColumnService - .getByCustomListId(dto.getId()); - - this.handleColumns = handleColumns.stream().map(t -> { - HandleColumnBo handleColumn = new HandleColumnBo(); - handleColumn.setId(t.getId()); - handleColumn.setName(t.getName()); - handleColumn.setViewType(t.getViewType().getCode()); - handleColumn.setBtnType(t.getBtnType().getCode()); - handleColumn.setBtnConfig(t.getBtnConfig()); - handleColumn.setWidth(t.getWidth()); - handleColumn.setIcon(t.getIcon()); - return handleColumn; - }).collect(Collectors.toList()); - } - - @Data - public static class ToolbarBo implements SuperBo { - - /** - * ID - */ - @ApiModelProperty(value = "ID") - private String id; - - /** - * 显示名称 - */ - @ApiModelProperty(value = "显示名称") - private String name; - - /** - * 显示类型 - */ - @ApiModelProperty(value = "显示类型") - private String viewType; - - /** - * 按钮类型 - */ - @ApiModelProperty(value = "按钮类型") - private Integer btnType; - - /** - * 按钮配置 - */ - @ApiModelProperty(value = "按钮配置") - private String btnConfig; - - /** - * 图标 - */ - @ApiModelProperty(value = "图标") - private String icon; - - /** - * 请求参数 - */ - @ApiModelProperty(value = "请求参数") - private String requestParam; - - /** - * 自定义表单ID - */ - @ApiModelProperty(value = "自定义表单ID") - private String customFormId; - - /** - * 自定义表单名称 - */ - @ApiModelProperty(value = "自定义表单名称") - private String customFormName; - } - - @Data - public static class QueryParamsBo implements SuperBo { - - /** - * ID - */ - @ApiModelProperty(value = "ID") - private String id; - - /** - * 关联ID - */ - @ApiModelProperty(value = "关联ID") - private String relaId; - - /** - * 前端显示 - */ - @ApiModelProperty(value = "前端显示") - private Boolean frontShow; - - /** - * 查询类型 - */ - @ApiModelProperty(value = "查询类型") - private Integer queryType; - - /** - * 表单宽度 - */ - @ApiModelProperty(value = "表单宽度") - private Integer formWidth; - - /** - * 默认值 - */ - @ApiModelProperty(value = "默认值") - private String defaultValue; - - /** - * 类型 - */ - @ApiModelProperty(value = "类型") - private Integer type; - - /** - * 数据类型 - */ - @ApiModelProperty("数据对象") - private Integer dataType; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private Integer viewType; - } - - @Data - public static class DetailBo implements SuperBo { - - /** - * ID - */ - @ApiModelProperty(value = "ID") - private String id; - - /** - * 关联ID - */ - @ApiModelProperty("关联ID") - private String relaId; - - /** - * 宽度类型 - */ - @ApiModelProperty(value = "宽度类型") - private Integer widthType; - - /** - * 是否页面排序 - */ - @ApiModelProperty(value = "是否页面排序") - private Boolean sortable; - - /** - * 宽度 - */ - @ApiModelProperty(value = "宽度") - private Integer width; - - /** - * 类型 - */ - @ApiModelProperty(value = "类型") - private Integer type; - - /** - * 格式化脚本 - */ - @ApiModelProperty("格式化脚本") - private String formatter; - } - - @Data - public static class HandleColumnBo implements SuperBo { - - /** - * ID - */ - @ApiModelProperty(value = "ID") - private String id; - - /** - * 显示名称 - */ - @ApiModelProperty(value = "显示名称") - private String name; - - /** - * 显示类型 - */ - @ApiModelProperty(value = "显示类型") - private String viewType; - - /** - * 按钮类型 - */ - @ApiModelProperty(value = "按钮类型") - private Integer btnType; - - /** - * 按钮配置 - */ - @ApiModelProperty(value = "按钮配置") - private String btnConfig; - - /** - * 图标 - */ - @ApiModelProperty(value = "图标") - private String icon; - - /** - * 请求参数 - */ - @ApiModelProperty(value = "请求参数") - private String requestParam; - - /** - * 宽度 - */ - @ApiModelProperty(value = "宽度") - private Integer width; - - /** - * 自定义表单ID - */ - @ApiModelProperty(value = "自定义表单ID") - private String customFormId; - - /** - * 自定义表单名称 - */ - @ApiModelProperty(value = "自定义表单名称") - private String customFormName; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 57e4f9c568529c30bd705d76a009f8367a891d2f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.list; - -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.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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QueryGenCustomListBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 修改人ID - */ - @ApiModelProperty("修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QueryGenCustomListBo() { - } - - public QueryGenCustomListBo(GenCustomList dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomList dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomListCategoryService genDataObjCategoryService = ApplicationUtil.getBean( - GenCustomListCategoryService.class); - GenCustomListCategory category = genDataObjCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a1ae71c1902781ee39927329327992464288515c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GenCustomListCategorySelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.list.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomListCategorySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public GenCustomListCategorySelectorBo() { - } - - public GenCustomListCategorySelectorBo(GenCustomListCategory dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4483cc8e83fca43d42d1e82b5f3605f2fba277d6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GetGenCustomListCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.list.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenCustomListCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public GetGenCustomListCategoryBo() { - - } - - public GetGenCustomListCategoryBo(GenCustomListCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8f2056bfdd3610b9efe52ce83744997eaf7b0581..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/QueryGenCustomListCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.list.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryGenCustomListCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public QueryGenCustomListCategoryBo() { - - } - - public QueryGenCustomListCategoryBo(GenCustomListCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2db767633bbefe3bcb233616058a607b17c3ec67..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.page; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomPageSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - public GenCustomPageSelectorBo() { - } - - public GenCustomPageSelectorBo(GenCustomPage dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomPage dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomPageCategoryService genCustomPageCategoryService = ApplicationUtil.getBean( - GenCustomPageCategoryService.class); - GenCustomPageCategory category = genCustomPageCategoryService - .findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ff9a06dfd0b30e4692d85faa2f7231b4b1c9164e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.page; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenCustomPageBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 页面代码 - */ - @ApiModelProperty("页面代码") - private String pageCode; - - /** - * 脚本代码 - */ - @ApiModelProperty("脚本代码") - private String scriptCode; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetGenCustomPageBo() { - } - - public GetGenCustomPageBo(GenCustomPage dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomPage dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomPageCategoryService genCustomPageCategoryService = ApplicationUtil.getBean( - GenCustomPageCategoryService.class); - GenCustomPageCategory category = genCustomPageCategoryService - .findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index feeabd496968039845f6bfe2cc9d63050ef26de2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.page; - -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.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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QueryGenCustomPageBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 修改人ID - */ - @ApiModelProperty("修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QueryGenCustomPageBo() { - } - - public QueryGenCustomPageBo(GenCustomPage dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomPage dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomPageCategoryService genCustomPageCategoryService = ApplicationUtil.getBean( - GenCustomPageCategoryService.class); - GenCustomPageCategory category = genCustomPageCategoryService - .findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9fd8647eed9413ebee1d8f6b4919434316cb7ecb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GenCustomPageCategorySelectorBo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.page.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomPageCategorySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - public GenCustomPageCategorySelectorBo() { - } - - public GenCustomPageCategorySelectorBo(GenCustomPageCategory dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bdcee25c2865451c4ce91152b9d3f7c8f261207e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GetGenCustomPageCategoryBo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.page.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenCustomPageCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - - public GetGenCustomPageCategoryBo() { - - } - - public GetGenCustomPageCategoryBo(GenCustomPageCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9cf1b32486d7f469e976a611e48cd0211dd0419f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/QueryGenCustomPageCategoryBo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.page.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryGenCustomPageCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - - public QueryGenCustomPageCategoryBo() { - - } - - public QueryGenCustomPageCategoryBo(GenCustomPageCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b03e72b9125ccae37eed8565d3f9ddf3de724205..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.selector; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomSelectorSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - public GenCustomSelectorSelectorBo() { - } - - public GenCustomSelectorSelectorBo(GenCustomSelector dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomSelector dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomSelectorCategoryService genCustomListCategoryService = ApplicationUtil.getBean( - GenCustomSelectorCategoryService.class); - GenCustomSelectorCategory category = genCustomListCategoryService - .findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4222f65a4d67e8b13215bcbf12fd51e2227ceb0a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.selector; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenCustomSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 数据对象ID - */ - @ApiModelProperty("数据对象ID") - private String dataObjId; - - /** - * 自定义列表ID - */ - @ApiModelProperty("自定义列表ID") - private String customListId; - - /** - * 自定义列表名称 - */ - @ApiModelProperty("自定义列表名称") - private String customListName; - - /** - * 对话框标题 - */ - @ApiModelProperty("对话框标题") - private String dialogTittle; - - /** - * 对话框宽度 - */ - @ApiModelProperty("对话框宽度") - private String dialogWidth; - - /** - * 占位符 - */ - @ApiModelProperty("占位符") - private String placeholder; - - /** - * ID字段 - */ - @ApiModelProperty("ID字段") - private String idColumn; - - /** - * 名称字段 - */ - @ApiModelProperty("名称字段") - private String nameColumn; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetGenCustomSelectorBo() { - } - - public GetGenCustomSelectorBo(GenCustomSelector dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomSelector dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomSelectorCategoryService genCustomListCategoryService = ApplicationUtil.getBean( - GenCustomSelectorCategoryService.class); - GenCustomSelectorCategory category = genCustomListCategoryService - .findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - - GenCustomListService genCustomListService = ApplicationUtil - .getBean(GenCustomListService.class); - GenCustomList customList = genCustomListService.findById(dto.getCustomListId()); - this.customListName = customList.getName(); - - this.dataObjId = customList.getDataObjId(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a47b7d6ec0dc8e5cdb96b1cbe943f68c015bcb5a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.selector; - -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.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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QueryGenCustomSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 修改人ID - */ - @ApiModelProperty("修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QueryGenCustomSelectorBo() { - } - - public QueryGenCustomSelectorBo(GenCustomSelector dto) { - super(dto); - } - - @Override - protected void afterInit(GenCustomSelector dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenCustomSelectorCategoryService customSelectorCategoryService = ApplicationUtil.getBean( - GenCustomSelectorCategoryService.class); - GenCustomSelectorCategory category = customSelectorCategoryService - .findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3388b136fe6128ba12c93df26012031384533b55..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GenCustomSelectorCategorySelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.selector.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomSelectorCategorySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public GenCustomSelectorCategorySelectorBo() { - } - - public GenCustomSelectorCategorySelectorBo(GenCustomSelectorCategory dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f6f303b565e5a7bfcd6c559916b8ea15b2e85802..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GetGenCustomSelectorCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.selector.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenCustomSelectorCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public GetGenCustomSelectorCategoryBo() { - - } - - public GetGenCustomSelectorCategoryBo(GenCustomSelectorCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 17f0a5424426a6c5651c55ce135b03a368b5d987..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/QueryGenCustomSelectorCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.custom.selector.category; - -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryGenCustomSelectorCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public QueryGenCustomSelectorCategoryBo() { - - } - - public QueryGenCustomSelectorCategoryBo(GenCustomSelectorCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2c13b7d5c2fb94029f71ea74b6ceaaa67c63d2c0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/DataEntityGenerateBo.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -import com.lframework.starter.common.functions.SFunction; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.bo.gen.GenCreateColumnConfigBo; -import com.lframework.xingyun.template.gen.bo.gen.GenDetailColumnConfigBo; -import com.lframework.xingyun.template.gen.bo.gen.GenGenerateInfoBo; -import com.lframework.xingyun.template.gen.bo.gen.GenQueryColumnConfigBo; -import com.lframework.xingyun.template.gen.bo.gen.GenQueryParamsColumnConfigBo; -import com.lframework.xingyun.template.gen.bo.gen.GenUpdateColumnConfigBo; -import com.lframework.xingyun.template.gen.dto.data.entity.DataEntityGenerateDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.stream.Collectors; -import lombok.Data; - -@Data -public class DataEntityGenerateBo extends BaseBo { - - /** - * 字段信息 - */ - @ApiModelProperty("字段信息") - private List columns; - - /** - * 基本设置 - */ - @ApiModelProperty("基本设置") - private GenGenerateInfoBo generateInfo; - - /** - * 新增配置 - */ - @ApiModelProperty("新增配置") - private List createConfigs; - - /** - * 修改配置 - */ - @ApiModelProperty("修改配置") - private List updateConfigs; - - /** - * 查询配置 - */ - @ApiModelProperty("查询配置") - private List queryConfigs; - - /** - * 查询参数配置 - */ - @ApiModelProperty("查询参数配置") - private List queryParamsConfigs; - - /** - * 详情配置 - */ - @ApiModelProperty("详情配置") - private List detailConfigs; - - public DataEntityGenerateBo(DataEntityGenerateDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(DataEntityGenerateDto dto) { - - return this; - } - - @Override - public BaseBo convert(DataEntityGenerateDto dto, - SFunction... columns) { - - return this; - } - - @Override - protected void afterInit(DataEntityGenerateDto dto) { - - this.columns = dto.getColumns().stream().map(GenDataEntityDetailGenerateBo::new) - .collect(Collectors.toList()); - this.generateInfo = - dto.getGenerateInfo() == null ? null : new GenGenerateInfoBo(dto.getGenerateInfo()); - if (!CollectionUtil.isEmpty(dto.getCreateConfigs())) { - this.createConfigs = dto.getCreateConfigs().stream().map(GenCreateColumnConfigBo::new) - .collect(Collectors.toList()); - } - - if (!CollectionUtil.isEmpty(dto.getUpdateConfigs())) { - this.updateConfigs = dto.getUpdateConfigs().stream().map(GenUpdateColumnConfigBo::new) - .collect(Collectors.toList()); - } - - if (!CollectionUtil.isEmpty(dto.getQueryConfigs())) { - this.queryConfigs = dto.getQueryConfigs().stream().map(GenQueryColumnConfigBo::new) - .collect(Collectors.toList()); - } - - if (!CollectionUtil.isEmpty(dto.getQueryParamsConfigs())) { - this.queryParamsConfigs = dto.getQueryParamsConfigs().stream() - .map(GenQueryParamsColumnConfigBo::new) - .collect(Collectors.toList()); - } - - if (!CollectionUtil.isEmpty(dto.getDetailConfigs())) { - this.detailConfigs = dto.getDetailConfigs().stream().map(GenDetailColumnConfigBo::new) - .collect(Collectors.toList()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ccc908ff999ec83af6ad7adccb8d5cd3fc72d2cd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntityDetailBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 字段显示名称 - */ - @ApiModelProperty("字段显示名称") - private String name; - - /** - * 字段名称 - */ - @ApiModelProperty("字段名称") - private String columnName; - - /** - * 是否主键 - */ - @ApiModelProperty("是否主键") - private Boolean isKey; - - /** - * 数据类型 - */ - @ApiModelProperty("数据类型") - private Integer dataType; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer columnOrder; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private Integer viewType; - - /** - * 是否内置枚举 - */ - @ApiModelProperty("是否内置枚举") - private Boolean fixEnum; - - /** - * 后端枚举名 - */ - @ApiModelProperty("后端枚举名") - private String enumBack; - - /** - * 前端枚举名 - */ - @ApiModelProperty("前端枚举名") - private String enumFront; - - /** - * 正则表达式 - */ - @ApiModelProperty("正则表达式") - private String regularExpression; - - /** - * 是否排序字段 - */ - @ApiModelProperty("是否排序字段") - private Boolean isOrder; - - /** - * 排序类型 - */ - @ApiModelProperty("排序类型") - private String orderType; - - /** - * 数据字典ID - */ - private String dataDicId; - - /** - * 数据字典名称 - */ - private String dataDicName; - - /** - * 自定义选择器ID - */ - private String customSelectorId; - - /** - * 自定义选择器名称 - */ - private String customSelectorName; - - /** - * 长度 - */ - @ApiModelProperty("长度") - private Long len; - - /** - * 小数位数 - */ - @ApiModelProperty("小数位数") - private Integer decimals; - - public GenDataEntityDetailBo() { - - } - - public GenDataEntityDetailBo(GenDataEntityDetail dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenDataEntityDetail dto) { - - return super.convert(dto, GenDataEntityDetailBo::getDataType, - GenDataEntityDetailBo::getViewType, GenDataEntityDetailBo::getOrderType); - } - - @Override - protected void afterInit(GenDataEntityDetail dto) { - - this.dataType = dto.getDataType().getCode(); - this.viewType = dto.getViewType().getCode(); - this.orderType = dto.getOrderType() == null ? null : dto.getOrderType().getCode(); - - if (!StringUtil.isBlank(dto.getDataDicId())) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(dto.getDataDicId()); - this.dataDicName = dic.getName(); - } - - if (!StringUtil.isBlank(dto.getCustomSelectorId())) { - GenCustomSelectorService genCustomSelectorService = ApplicationUtil - .getBean(GenCustomSelectorService.class); - GenCustomSelector selector = genCustomSelectorService.findById(dto.getCustomSelectorId()); - this.customSelectorName = selector.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1206a1d2670bf92890eb4329b3f737ca6667fec4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailGenerateBo.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntityDetailGenerateBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 字段显示名称 - */ - @ApiModelProperty("字段显示名称") - private String name; - - /** - * 字段名称 - */ - @ApiModelProperty("字段名称") - private String columnName; - - /** - * 是否主键 - */ - @ApiModelProperty("是否主键") - private Boolean isKey; - - /** - * 数据类型 - */ - @ApiModelProperty("数据类型") - private Integer dataType; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer columnOrder; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private Integer viewType; - - /** - * 是否内置枚举 - */ - @ApiModelProperty("是否内置枚举") - private Boolean fixEnum; - - /** - * 后端枚举名 - */ - @ApiModelProperty("后端枚举名") - private String enumBack; - - /** - * 前端枚举名 - */ - @ApiModelProperty("前端枚举名") - private String enumFront; - - /** - * 正则表达式 - */ - @ApiModelProperty("正则表达式") - private String regularExpression; - - /** - * 是否排序字段 - */ - @ApiModelProperty("是否排序字段") - private Boolean isOrder; - - /** - * 排序类型 - */ - @ApiModelProperty("排序类型") - private String orderType; - - public GenDataEntityDetailGenerateBo() { - - } - - public GenDataEntityDetailGenerateBo(GenDataEntityDetail dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenDataEntityDetail dto) { - - return super.convert(dto, GenDataEntityDetailGenerateBo::getDataType, - GenDataEntityDetailGenerateBo::getViewType, - GenDataEntityDetailGenerateBo::getOrderType); - } - - @Override - protected void afterInit(GenDataEntityDetail dto) { - - this.dataType = dto.getDataType().getCode(); - this.viewType = dto.getViewType().getCode(); - this.orderType = dto.getOrderType() == null ? null : dto.getOrderType().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 664ba46e049a76ed4d64dd34e6d92512c054367a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailSelectorBo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntityDetailSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public GenDataEntityDetailSelectorBo() { - } - - public GenDataEntityDetailSelectorBo(GenDataEntityDetail dto) { - super(dto); - } - - @Override - protected void afterInit(GenDataEntityDetail dto) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5f59c807dec27e73f4a5712be22557d2f9e8d99b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntitySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - public GenDataEntitySelectorBo() { - } - - public GenDataEntitySelectorBo(GenDataEntity dto) { - super(dto); - } - - @Override - protected void afterInit(GenDataEntity dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenDataEntityCategoryService genDataEntityCategoryService = ApplicationUtil.getBean( - GenDataEntityCategoryService.class); - GenDataEntityCategory category = genDataEntityCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9dc2ff18915c46821f8923f18be7aa9355bdb717..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.stream.Collectors; -import lombok.Data; - -@Data -public class GetDataEntityBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 数据表 - */ - @ApiModelProperty("数据表") - private String tableName; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 字段信息 - */ - @ApiModelProperty("字段信息") - private List columns; - - public GetDataEntityBo() { - - } - - public GetDataEntityBo(GenDataEntity dto) { - - super(dto); - } - - @Override - protected void afterInit(GenDataEntity dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenDataEntityCategoryService genDataEntityCategoryService = ApplicationUtil.getBean( - GenDataEntityCategoryService.class); - GenDataEntityCategory category = genDataEntityCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - - this.tableName = dto.getTableName(); - - GenDataEntityDetailService genDataEntityDetailService = ApplicationUtil.getBean( - GenDataEntityDetailService.class); - List details = genDataEntityDetailService.getByEntityId(dto.getId()); - this.columns = details.stream().map(GenDataEntityDetailBo::new).collect(Collectors.toList()); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 650e9e42f7a7723890662349b40327f7de684276..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity; - -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.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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QueryDataEntityBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 生成状态 - */ - @ApiModelProperty("生成状态") - private Integer genStatus; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 修改人ID - */ - @ApiModelProperty("修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QueryDataEntityBo() { - } - - public QueryDataEntityBo(GenDataEntity dto) { - super(dto); - } - - @Override - protected void afterInit(GenDataEntity dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenDataEntityCategoryService genDataEntityCategoryService = ApplicationUtil.getBean( - GenDataEntityCategoryService.class); - GenDataEntityCategory category = genDataEntityCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - this.genStatus = dto.getGenStatus().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 081db459ca9b7ac6927a4e43d1c8848a0e974580..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GenDataEntityCategorySelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity.category; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntityCategorySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public GenDataEntityCategorySelectorBo() { - } - - public GenDataEntityCategorySelectorBo(GenDataEntityCategory dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index aa00336f26eb6b42318a5716220b49d3b9895fd2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GetGenDataEntityCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity.category; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenDataEntityCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public GetGenDataEntityCategoryBo() { - - } - - public GetGenDataEntityCategoryBo(GenDataEntityCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7aaa0f088572b90b6ebe5fba024f5ef07603a491..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/QueryGenDataEntityCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.entity.category; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryGenDataEntityCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public QueryGenDataEntityCategoryBo() { - - } - - public QueryGenDataEntityCategoryBo(GenDataEntityCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f18b02d35479104025307477d29ff77ccb98e906..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjColumnBo.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj; - -import com.lframework.starter.web.bo.SuperBo; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import lombok.Data; - -@Data -public class GenDataObjColumnBo implements SuperBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 数据对象名称 - */ - @ApiModelProperty("数据对象名称") - private String name; - - /** - * 列 - */ - @ApiModelProperty("列") - private List columns; - - @Data - public static class ColumnBo implements SuperBo { - - /** - * 数据实体明细ID - */ - @ApiModelProperty("数据实体明细ID") - private String id; - - /** - * 关联ID - */ - @ApiModelProperty("关联ID") - private String relaId; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - private String name; - - /** - * 类型 - */ - @ApiModelProperty("类型") - private Integer type; - - /** - * 数据类型 - */ - @ApiModelProperty("数据对象") - private Integer dataType; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private Integer viewType; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ddc1fd54ca51bb4cabfc1d7fd05afe7643194ae1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj; - -import com.lframework.starter.common.constants.StringPool; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataObjDetailBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 主表字段 - */ - @ApiModelProperty("主表字段") - private String[] mainTableDetailIds; - - /** - * 关联类型 - */ - @ApiModelProperty("关联类型") - private Integer relaType; - - /** - * 关联方式 - */ - @ApiModelProperty("关联方式") - private Integer relaMode; - - /** - * 子表ID - */ - @ApiModelProperty("子表ID") - private String subTableId; - - /** - * 子表名称 - */ - @ApiModelProperty("子表名称") - private String subTableName; - - /** - * 子表别名 - */ - @ApiModelProperty("子表别名") - private String subTableAlias; - - /** - * 子表字段 - */ - @ApiModelProperty("子表字段") - private String[] subTableDetailIds; - - public GenDataObjDetailBo() { - - } - - public GenDataObjDetailBo(GenDataObjDetail dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenDataObjDetail dto) { - - return super.convert(dto, GenDataObjDetailBo::getRelaType, GenDataObjDetailBo::getRelaMode, - GenDataObjDetailBo::getMainTableDetailIds, GenDataObjDetailBo::getSubTableDetailIds); - } - - @Override - protected void afterInit(GenDataObjDetail dto) { - - this.relaType = dto.getRelaType().getCode(); - this.relaMode = dto.getRelaMode().getCode(); - this.mainTableDetailIds = dto.getMainTableDetailIds().split(StringPool.STR_SPLIT); - this.subTableDetailIds = dto.getSubTableDetailIds().split(StringPool.STR_SPLIT); - - GenDataEntityService genDataEntityService = ApplicationUtil.getBean( - GenDataEntityService.class); - GenDataEntity entity = genDataEntityService.findById(dto.getSubTableId()); - this.subTableName = entity.getName(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e000eee45276fa6776f3d15c6e53df5e9f34ef40..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjQueryDetailBo.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj; - -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataObjQueryDetailBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - private String customName; - - /** - * 自定义SQL - */ - @ApiModelProperty("自定义SQL") - private String customSql; - - /** - * 别名 - */ - @ApiModelProperty("别名") - private String customAlias; - - /** - * 数据类型 - */ - @ApiModelProperty("数据类型") - private Integer dataType; - - public GenDataObjQueryDetailBo() { - - } - - public GenDataObjQueryDetailBo(GenDataObjQueryDetail dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenDataObjQueryDetail dto) { - - return super.convert(dto); - } - - @Override - protected void afterInit(GenDataObjQueryDetail dto) { - this.dataType = dto.getDataType().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index df8048f435f2d00145948d68ae25bc463997372e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataObjSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - public GenDataObjSelectorBo() { - } - - public GenDataObjSelectorBo(GenDataObj dto) { - super(dto); - } - - @Override - protected void afterInit(GenDataObj dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenDataObjCategoryService genDataObjCategoryService = ApplicationUtil.getBean( - GenDataObjCategoryService.class); - GenDataObjCategory category = genDataObjCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8053218a19cf65825703189b64f1c97a4064a0b0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.stream.Collectors; -import lombok.Data; - -@Data -public class GetGenDataObjBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 主表ID - */ - @ApiModelProperty("主表ID") - private String mainTableId; - - /** - * 主表名称 - */ - @ApiModelProperty("主表名称") - private String mainTableName; - - /** - * 主表别名 - */ - @ApiModelProperty("主表别名") - private String mainTableAlias; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 关联字段 - */ - @ApiModelProperty("关联字段") - private List columns; - - /** - * 自定义查询 - */ - @ApiModelProperty("自定义查询") - private List queryColumns; - - public GetGenDataObjBo() { - - } - - public GetGenDataObjBo(GenDataObj dto) { - - super(dto); - } - - @Override - protected void afterInit(GenDataObj dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenDataObjCategoryService genDataObjCategoryService = ApplicationUtil.getBean( - GenDataObjCategoryService.class); - GenDataObjCategory category = genDataObjCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - - GenDataEntityService genDataEntityService = ApplicationUtil.getBean( - GenDataEntityService.class); - GenDataEntity entity = genDataEntityService.findById(dto.getMainTableId()); - this.mainTableName = entity.getName(); - - GenDataObjDetailService genDataObjDetailService = ApplicationUtil.getBean( - GenDataObjDetailService.class); - List details = genDataObjDetailService.getByObjId(dto.getId()); - if (!CollectionUtil.isEmpty(details)) { - this.columns = details.stream().map(GenDataObjDetailBo::new).collect(Collectors.toList()); - } - - GenDataObjQueryDetailService genDataObjQueryDetailService = ApplicationUtil.getBean( - GenDataObjQueryDetailService.class); - List queryDetails = genDataObjQueryDetailService.getByObjId(dto.getId()); - if (!CollectionUtil.isEmpty(queryDetails)) { - this.queryColumns = queryDetails.stream().map(GenDataObjQueryDetailBo::new) - .collect(Collectors.toList()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0d6b2f45777dd9dff27931bce465e3426fff61e7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj; - -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.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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QueryGenDataObjBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 修改人ID - */ - @ApiModelProperty("修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QueryGenDataObjBo() { - } - - public QueryGenDataObjBo(GenDataObj dto) { - super(dto); - } - - @Override - protected void afterInit(GenDataObj dto) { - - if (!StringUtil.isBlank(dto.getCategoryId())) { - GenDataObjCategoryService genDataObjCategoryService = ApplicationUtil.getBean( - GenDataObjCategoryService.class); - GenDataObjCategory category = genDataObjCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5d1e6a663fd666b391a0f7eb12ad2f329d3fac92..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GenDataObjCategorySelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj.category; - -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataObjCategorySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public GenDataObjCategorySelectorBo() { - } - - public GenDataObjCategorySelectorBo(GenDataObjCategory dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fa1db89cebaf648e6b444af6d888641839ca8712..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GetGenDataObjCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj.category; - -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetGenDataObjCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public GetGenDataObjCategoryBo() { - - } - - public GetGenDataObjCategoryBo(GenDataObjCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 98583deb7bc6b01212af1ed833424f8a8b542365..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/QueryGenDataObjCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.data.obj.category; - -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryGenDataObjCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public QueryGenDataObjCategoryBo() { - - } - - public QueryGenDataObjCategoryBo(GenDataObjCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 194cda537f37a5319a2def206ba9f3f8c64f642c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenCreateColumnConfigBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.gen; - -import com.lframework.xingyun.template.gen.dto.gen.GenCreateColumnConfigDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCreateColumnConfigBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 是否必填 - */ - @ApiModelProperty("是否必填") - private Boolean required; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer orderNo; - - public GenCreateColumnConfigBo() { - - } - - public GenCreateColumnConfigBo(GenCreateColumnConfigDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenCreateColumnConfigDto dto) { - - return super.convert(dto); - } - - @Override - protected void afterInit(GenCreateColumnConfigDto dto) { - - super.afterInit(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3ac614de09b732ccbd17b01815d71801a28749e4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenDetailColumnConfigBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.gen; - -import com.lframework.xingyun.template.gen.dto.gen.GenDetailColumnConfigDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDetailColumnConfigBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 列宽 - */ - @ApiModelProperty("列宽") - private Integer span; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer orderNo; - - public GenDetailColumnConfigBo() { - - } - - public GenDetailColumnConfigBo(GenDetailColumnConfigDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenDetailColumnConfigDto dto) { - - return super.convert(dto); - } - - @Override - protected void afterInit(GenDetailColumnConfigDto dto) { - - super.afterInit(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 365a86b0872ee5eb28cfe88640649a10ff499757..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.gen; - -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.utils.ApplicationUtil; -import lombok.Data; - -@Data -public class GenGenerateInfoBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 生成模板类型 - */ - private Integer templateType; - - /** - * 包名 - */ - private String packageName; - - /** - * 模块名 - */ - private String moduleName; - - /** - * 业务名 - */ - private String bizName; - - /** - * 类名 - */ - private String className; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 父级菜单ID - */ - private String parentMenuId; - - /** - * 父级菜单名称 - */ - private String parentMenuName; - - /** - * 主键类型 - */ - private Integer keyType; - - /** - * 作者 - */ - private String author; - - /** - * 本级菜单编号 - */ - private String menuCode; - - /** - * 本级菜单名称 - */ - private String menuName; - - /** - * 详情页Span总数量 - */ - private Integer detailSpan; - - /** - * 是否应用缓存 - */ - private Boolean isCache; - - /** - * 是否内置删除功能 - */ - private Boolean hasDelete; - - public GenGenerateInfoBo() { - - } - - public GenGenerateInfoBo(GenGenerateInfoDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenGenerateInfoDto dto) { - - return super.convert(dto, GenGenerateInfoBo::getTemplateType, GenGenerateInfoBo::getKeyType); - } - - @Override - protected void afterInit(GenGenerateInfoDto dto) { - - this.templateType = dto.getTemplateType().getCode(); - this.keyType = dto.getKeyType().getCode(); - - if (!StringUtil.isBlank(dto.getParentMenuId())) { - SysMenuService sysMenuService = ApplicationUtil.getBean(SysMenuService.class); - this.parentMenuName = sysMenuService.findById(dto.getParentMenuId()).getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index db1a9cd621020e093435ef6cf073d61ebf9eebba..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryColumnConfigBo.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.gen; - -import com.lframework.xingyun.template.gen.dto.gen.GenQueryColumnConfigDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenQueryColumnConfigBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 宽度类型 - */ - @ApiModelProperty("宽度类型") - private Integer widthType; - - /** - * 宽度 - */ - @ApiModelProperty("宽度") - private Integer width; - - /** - * 是否页面排序 - */ - @ApiModelProperty("是否页面排序") - private Boolean sortable; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer orderNo; - - public GenQueryColumnConfigBo() { - - } - - public GenQueryColumnConfigBo(GenQueryColumnConfigDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenQueryColumnConfigDto dto) { - - return super.convert(dto, GenQueryColumnConfigBo::getWidthType); - } - - @Override - protected void afterInit(GenQueryColumnConfigDto dto) { - - this.widthType = dto.getWidthType().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c117f8fd97d6cab1a00c0411ed3ef6c18b8e530b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryParamsColumnConfigBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.gen; - -import com.lframework.xingyun.template.gen.dto.gen.GenQueryParamsColumnConfigDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenQueryParamsColumnConfigBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 查询类型 - */ - @ApiModelProperty("查询类型") - private Integer queryType; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer orderNo; - - public GenQueryParamsColumnConfigBo() { - - } - - public GenQueryParamsColumnConfigBo(GenQueryParamsColumnConfigDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenQueryParamsColumnConfigDto dto) { - - return super.convert(dto, GenQueryParamsColumnConfigBo::getQueryType); - } - - @Override - protected void afterInit(GenQueryParamsColumnConfigDto dto) { - - this.queryType = dto.getQueryType().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 579c9176a1550e17dd5a073efa98f6855103ca4e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenUpdateColumnConfigBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.gen; - -import com.lframework.xingyun.template.gen.dto.gen.GenUpdateColumnConfigDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenUpdateColumnConfigBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 是否必填 - */ - @ApiModelProperty("是否必填") - private Boolean required; - - /** - * 排序编号 - */ - @ApiModelProperty("排序编号") - private Integer orderNo; - - public GenUpdateColumnConfigBo() { - - } - - public GenUpdateColumnConfigBo(GenUpdateColumnConfigDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(GenUpdateColumnConfigDto dto) { - - return super.convert(dto); - } - - @Override - protected void afterInit(GenUpdateColumnConfigDto dto) { - - super.afterInit(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2f6be82ff0333d5059602c6f0d3c76e70a9a8936..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/simpledb/SimpleDBSelectorBo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.bo.simpledb; - -import com.lframework.xingyun.template.gen.dto.simpledb.SimpleDBDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SimpleDBSelectorBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * 库名 - */ - @ApiModelProperty("库名") - private String tableSchema; - - /** - * 表名 - */ - @ApiModelProperty("表名") - private String tableName; - - public SimpleDBSelectorBo() { - - } - - public SimpleDBSelectorBo(SimpleDBDto dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c06a039d071d40c9e07f1071bca3dd0e6a867ca3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java +++ /dev/null @@ -1,370 +0,0 @@ -package com.lframework.xingyun.template.gen.builders; - -import cn.hutool.core.convert.Convert; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -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.xingyun.template.gen.components.custom.list.CustomListConfig; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig.FieldConfig; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig.HandleColumn; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig.ListConfig; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig.QueryParam; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig.Toolbar; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryObj; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryParamObj; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; -import com.lframework.xingyun.template.gen.entity.GenCustomListHandleColumn; -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.xingyun.template.gen.entity.GenCustomListToolbar; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import com.lframework.xingyun.template.gen.service.GenCustomListDetailService; -import com.lframework.xingyun.template.gen.service.GenCustomListHandleColumnService; -import com.lframework.xingyun.template.gen.service.GenCustomListQueryParamsService; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.service.GenCustomListToolbarService; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -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.utils.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; - -@Component -public class CustomListBuilder { - - @Autowired - private GenCustomListService genCustomListService; - - @Autowired - private GenCustomListDetailService genCustomListDetailService; - - @Autowired - private GenCustomListQueryParamsService genCustomListQueryParamsService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Autowired - private GenDataObjService genDataObjService; - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Autowired - private GenDataObjQueryDetailService genDataObjQueryDetailService; - - @Autowired - private DataObjectBuilder dataObjectBuilder; - - @Autowired - private GenCustomListToolbarService genCustomListToolbarService; - - @Autowired - private GenCustomListHandleColumnService genCustomListHandleColumnService; - - public DataObjectQueryObj buildQueryObj(String id, DataObjectQueryParamObj queryParamObj) { - GenCustomList customList = genCustomListService.findById(id); - if (customList == null) { - throw new DefaultClientException("自定义列表不存在！"); - } - - CustomListBuilder customListBuilder = ApplicationUtil.getBean(CustomListBuilder.class); - CustomListConfig config = customListBuilder.buildConfig(id); - - DataObjectQueryObj obj = dataObjectBuilder.buildQueryObj(customList.getDataObjId()); - obj.setQueryParamObj(this.buildQueryParamObj(queryParamObj, config)); - obj.setSuffixSql(customList.getSuffixSql()); - obj.setQueryPrefixSql(customList.getQueryPrefixSql()); - obj.setQuerySuffixSql(customList.getQuerySuffixSql()); - - return obj; - } - - @Cacheable(value = CustomListConfig.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - public CustomListConfig buildConfig(String id) { - - // 先查询配置信息 - GenCustomList data = genCustomListService.findById(id); - - if (data == null) { - throw new DefaultClientException("自定义列表不存在！"); - } - - CustomListConfig result = new CustomListConfig(); - - List toolbars = genCustomListToolbarService - .getByCustomListId(data.getId()); - if (!CollectionUtil.isEmpty(toolbars)) { - result.setToolbars(toolbars.stream().map(t -> { - Toolbar toolbar = new Toolbar(); - toolbar.setId(t.getId()); - toolbar.setName(t.getName()); - toolbar.setViewType(t.getViewType().getCode()); - toolbar.setBtnType(t.getBtnType().getCode()); - toolbar.setBtnConfig(t.getBtnConfig()); - toolbar.setRequestParam(t.getRequestParam()); - toolbar.setIcon(t.getIcon()); - - return toolbar; - }).collect(Collectors.toList())); - } - - List handleColumns = genCustomListHandleColumnService - .getByCustomListId(data.getId()); - if (!CollectionUtil.isEmpty(handleColumns)) { - result.setHandleColumns(handleColumns.stream().map(t -> { - HandleColumn handleColumn = new HandleColumn(); - handleColumn.setId(t.getId()); - handleColumn.setName(t.getName()); - handleColumn.setViewType(t.getViewType().getCode()); - handleColumn.setBtnType(t.getBtnType().getCode()); - handleColumn.setBtnConfig(t.getBtnConfig()); - handleColumn.setRequestParam(t.getRequestParam()); - handleColumn.setIcon(t.getIcon()); - handleColumn.setWidth(t.getWidth()); - - return handleColumn; - }).collect(Collectors.toList())); - } - - List genCustomListQueryParamsList = genCustomListQueryParamsService - .getByCustomListId( - data.getId()); - List genCustomListDetailList = genCustomListDetailService - .getByCustomListId( - data.getId()); - - List queryParams = new ArrayList<>(); - - if (CollectionUtil.isNotEmpty(genCustomListQueryParamsList)) { - for (GenCustomListQueryParams genCustomListQueryParams : genCustomListQueryParamsList) { - GenDataEntityDetail entityDetail = genDataEntityDetailService.getById( - genCustomListQueryParams.getDataEntityId()); - - String relaId = genCustomListQueryParams.getRelaId(); - GenDataObj dataObj = null; - GenDataObjDetail dataObjDetail = null; - if (genCustomListQueryParams.getType() == GenCustomListDetailType.MAIN_TABLE) { - dataObj = genDataObjService.findById(relaId); - } else if (genCustomListQueryParams.getType() == GenCustomListDetailType.SUB_TALBE) { - dataObjDetail = genDataObjDetailService.getById(relaId); - } else { - throw new DefaultSysException("不支持的类型！"); - } - - QueryParam queryParam = new QueryParam(); - queryParam.setTableAlias( - genCustomListQueryParams.getType() == GenCustomListDetailType.SUB_TALBE - ? dataObjDetail.getSubTableAlias() : dataObj.getMainTableAlias()); - queryParam.setColumnName(entityDetail.getDbColumnName()); - queryParam.setName(entityDetail.getName()); - queryParam.setFrontShow(genCustomListQueryParams.getFrontShow()); - queryParam.setQueryType(genCustomListQueryParams.getQueryType().getCode()); - queryParam.setFormWidth(genCustomListQueryParams.getFormWidth()); - queryParam.setViewType(entityDetail.getViewType().getCode()); - queryParam.setDataType(entityDetail.getDataType().getCode()); - queryParam.setFixEnum(entityDetail.getFixEnum()); - queryParam.setFrontType(entityDetail.getEnumFront()); - if (StringUtil.isNotEmpty(genCustomListQueryParams.getDefaultValue())) { - queryParam.setDefaultValue(Convert.convert( - entityDetail.getViewType() == GenViewType.DATE_RANGE ? String.class - : entityDetail.getDataType().getClazz(), - genCustomListQueryParams.getDefaultValue())); - } - queryParam.setHasAvailableTag( - entityDetail.getViewType() == GenViewType.SELECT - && entityDetail.getDataType() == GenDataType.BOOLEAN - && "available".equals(entityDetail.getColumnName())); - - if (entityDetail.getViewType() == GenViewType.DATA_DIC) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(entityDetail.getDataDicId()); - queryParam.setDataDicCode(dic.getCode()); - } else if (entityDetail.getViewType() == GenViewType.CUSTOM_SELECTOR) { - GenCustomSelectorService genCustomSelectorService = ApplicationUtil - .getBean(GenCustomSelectorService.class); - GenCustomSelector selector = genCustomSelectorService - .findById(entityDetail.getCustomSelectorId()); - queryParam.setCustomSelectorId(selector.getId()); - } - - queryParams.add(queryParam); - } - } - - result.setQueryParams(queryParams); - - ListConfig listConfig = new ListConfig(); - listConfig.setId(data.getId()); - listConfig.setListType(data.getListType().getCode()); - listConfig.setLabelWidth(data.getLabelWidth()); - listConfig.setHasPage(data.getHasPage()); - listConfig.setTreeData(data.getTreeData()); - GenDataEntityDetail idColumnEntityDetail = genDataEntityDetailService - .getById(data.getIdColumn()); - GenDataObj idColumnDataObj = genDataObjService.findById(data.getIdColumnRelaId()); - GenDataObjDetail idColumnDataObjDetail = genDataObjDetailService - .getById(data.getIdColumnRelaId()); - - listConfig.setIdColumn( - (idColumnDataObj == null ? idColumnDataObjDetail.getSubTableAlias() - : idColumnDataObj.getMainTableAlias()) + "_" - + idColumnEntityDetail.getDbColumnName()); - listConfig.setAllowExport(data.getAllowExport()); - - if (data.getTreeData()) { - GenDataEntityDetail entityDetail = genDataEntityDetailService - .getById(data.getTreePidColumn()); - GenDataObj dataObj = genDataObjService.findById(data.getTreePidColumnRelaId()); - GenDataObjDetail dataObjDetail = genDataObjDetailService - .getById(data.getTreePidColumnRelaId()); - - listConfig.setTreePidColumn( - (dataObj == null ? dataObjDetail.getSubTableAlias() : dataObj.getMainTableAlias()) + "_" - + entityDetail.getDbColumnName()); - - entityDetail = genDataEntityDetailService.getById(data.getTreeNodeColumn()); - dataObj = genDataObjService.findById(data.getTreeNodeColumnRelaId()); - dataObjDetail = genDataObjDetailService - .getById(data.getTreeNodeColumnRelaId()); - - listConfig.setTreeNodeColumn( - (dataObj == null ? dataObjDetail.getSubTableAlias() : dataObj.getMainTableAlias()) + "_" - + entityDetail.getDbColumnName()); - - listConfig.setTreeChildrenKey(data.getTreeChildrenKey()); - } - - List fieldConfigs = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(genCustomListDetailList)) { - for (GenCustomListDetail genCustomListDetail : genCustomListDetailList) { - String relaId = genCustomListDetail.getRelaId(); - GenDataEntityDetail entityDetail = null; - GenDataObjQueryDetail dataObjQueryDetail = null; - - GenDataObj dataObj = null; - GenDataObjDetail dataObjDetail = null; - if (genCustomListDetail.getType() == GenCustomListDetailType.MAIN_TABLE) { - entityDetail = genDataEntityDetailService.getById(genCustomListDetail.getDataEntityId()); - dataObj = genDataObjService.findById(relaId); - } else if (genCustomListDetail.getType() == GenCustomListDetailType.SUB_TALBE) { - entityDetail = genDataEntityDetailService.getById(genCustomListDetail.getDataEntityId()); - dataObjDetail = genDataObjDetailService.getById(relaId); - } else { - dataObjQueryDetail = genDataObjQueryDetailService.getById( - genCustomListDetail.getRelaId()); - } - FieldConfig fieldConfig = new FieldConfig(); - fieldConfig.setName((genCustomListDetail.getType() == GenCustomListDetailType.MAIN_TABLE - || genCustomListDetail.getType() == GenCustomListDetailType.SUB_TALBE) - ? entityDetail.getName() : dataObjQueryDetail.getCustomName()); - - if (genCustomListDetail.getType() == GenCustomListDetailType.MAIN_TABLE) { - fieldConfig.setColumnName( - dataObj.getMainTableAlias() + "_" + entityDetail.getDbColumnName()); - } else if (genCustomListDetail.getType() == GenCustomListDetailType.SUB_TALBE) { - fieldConfig.setColumnName( - dataObjDetail.getSubTableAlias() + "_" + entityDetail.getDbColumnName()); - } else { - fieldConfig.setColumnName("custom_" + dataObjQueryDetail.getCustomAlias()); - } - - fieldConfig.setWidthType(genCustomListDetail.getWidthType().getCode()); - fieldConfig.setWidth(genCustomListDetail.getWidth()); - fieldConfig.setSortable(genCustomListDetail.getSortable()); - fieldConfig.setFormatter(genCustomListDetail.getFormatter()); - if (genCustomListDetail.getType() == GenCustomListDetailType.MAIN_TABLE - || genCustomListDetail.getType() == GenCustomListDetailType.SUB_TALBE) { - fieldConfig.setIsNumberType(GenDataType.isNumberType(entityDetail.getDataType())); - fieldConfig.setHasAvailableTag( - entityDetail.getViewType() == GenViewType.SELECT - && entityDetail.getDataType() == GenDataType.BOOLEAN - && "available".equals(entityDetail.getColumnName())); - fieldConfig.setFrontType(entityDetail.getEnumFront()); - fieldConfig.setFixEnum(entityDetail.getFixEnum()); - fieldConfig.setDataType(entityDetail.getDataType().getCode()); - } else { - fieldConfig.setIsNumberType(GenDataType.isNumberType(dataObjQueryDetail.getDataType())); - fieldConfig.setHasAvailableTag(false); - fieldConfig.setFrontType(StringPool.EMPTY_STR); - fieldConfig.setFixEnum(false); - fieldConfig.setDataType(dataObjQueryDetail.getDataType().getCode()); - } - - fieldConfigs.add(fieldConfig); - } - } - - listConfig.setFields(fieldConfigs); - result.setListConfig(listConfig); - - return result; - } - - private DataObjectQueryParamObj buildQueryParamObj(DataObjectQueryParamObj queryParamObj, - CustomListConfig config) { - if (queryParamObj == null) { - return null; - } - - if (CollectionUtil.isNotEmpty(queryParamObj.getConditions())) { - for (DataObjectQueryParamObj.Condition condition : queryParamObj.getConditions()) { - FieldConfig fieldConfig = config.getListConfig().getFields().stream().filter( - t -> (condition.getTableAlias() + "_" + condition.getColumnName()) - .equals(t.getColumnName())).findFirst().orElse(null); - if (fieldConfig != null) { - if (condition.getValue() != null) { - condition.setValue(Convert.convert( - EnumUtil.getByCode(GenDataType.class, fieldConfig.getDataType()).getClazz(), - condition.getValue())); - } else if (CollectionUtil.isNotEmpty(condition.getValues())) { - condition.setValues(condition.getValues().stream().map(t -> Convert.convert( - EnumUtil.getByCode(GenDataType.class, fieldConfig.getDataType()).getClazz(), t)) - .collect(Collectors.toList())); - } - } - GenQueryType queryType = EnumUtil.getByCode(GenQueryType.class, condition.getQueryType()); - if (queryType == GenQueryType.IN) { - condition.setValuePrefix("("); - condition.setValueSuffix(")"); - } else if (queryType == GenQueryType.NOT_IN) { - condition.setValuePrefix("("); - condition.setValueSuffix(")"); - } else if (queryType == GenQueryType.LEFT_LIKE) { - condition.setValuePrefix("CONCAT('%',"); - condition.setValueSuffix(")"); - } else if (queryType == GenQueryType.RIGHT_LIKE) { - condition.setValuePrefix("CONCAT("); - condition.setValueSuffix(", '%')"); - } else if (queryType == GenQueryType.AROUND_LIKE) { - condition.setValuePrefix("CONCAT('%',"); - condition.setValueSuffix(", '%')"); - } else { - condition.setValuePrefix(StringPool.EMPTY_STR); - condition.setValueSuffix(StringPool.EMPTY_STR); - } - } - } - return queryParamObj; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6a8d82c43a0db0dd8753e9e6b5431a0aafb30051..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomPageBuilder.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.builders; - -import cn.hutool.json.JSONObject; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.xingyun.template.gen.components.custom.page.CustomPageConfig; -import com.lframework.xingyun.template.gen.service.GenCustomPageService; -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.starter.web.utils.JsonUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class CustomPageBuilder { - - @Autowired - private GenCustomPageService genCustomPageService; - - //@Cacheable(value = CustomPageConfig.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - public CustomPageConfig buildConfig(Integer id) { - - GenCustomPage page = genCustomPageService.findById(id); - if (page == null) { - throw new DefaultClientException("自定义页面不存在！"); - } - - CustomPageConfig config = new CustomPageConfig(); - config.setId(page.getId()); - JSONObject obj = new JSONObject(); - obj.set("template", page.getPageCode()); - String templateStr = JsonUtil.toJsonStr(obj); - templateStr = templateStr.substring("{\"template\":".length(), templateStr.length() - 1); - - String scriptStr = page.getScriptCode(); - String componentConfig = scriptStr.substring(0, scriptStr.indexOf("{") + 1) + "template:" + templateStr + "," + scriptStr.substring(scriptStr.indexOf("{") + 1); - componentConfig = "return " + componentConfig.substring("export default".length()); - config.setComponentConfig(componentConfig); - - return config; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d5866b5ecfeae29f64ab79ccead8cda3c289b472..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomSelectorBuilder.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.lframework.xingyun.template.gen.builders; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.xingyun.template.gen.components.custom.selector.CustomSelectorConfig; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; - -@Component -public class CustomSelectorBuilder { - - @Autowired - private GenCustomSelectorService genCustomSelectorService; - - @Autowired - private GenDataObjService genDataObjService; - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Cacheable(value = CustomSelectorConfig.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - public CustomSelectorConfig buildConfig(String id) { - - // 先查询配置信息 - GenCustomSelector data = genCustomSelectorService.findById(id); - - if (data == null) { - throw new DefaultClientException("自定义选择器不存在！"); - } - - GenDataObj dataObj = genDataObjService.findById(data.getIdColumnRelaId()); - GenDataObjDetail dataObjDetail = genDataObjDetailService.getById(data.getIdColumnRelaId()); - GenDataEntityDetail entityDetail = genDataEntityDetailService.getById(data.getIdColumn()); - - CustomSelectorConfig result = new CustomSelectorConfig(); - result.setCustomListId(data.getCustomListId()); - result.setIdColumn( - (dataObj == null ? dataObjDetail.getSubTableAlias() : dataObj.getMainTableAlias()) + "_" - + entityDetail.getDbColumnName()); - - dataObj = genDataObjService.findById(data.getNameColumnRelaId()); - dataObjDetail = genDataObjDetailService.getById(data.getNameColumnRelaId()); - entityDetail = genDataEntityDetailService.getById(data.getNameColumn()); - - result.setNameColumn( - (dataObj == null ? dataObjDetail.getSubTableAlias() : dataObj.getMainTableAlias()) + "_" - + entityDetail.getDbColumnName()); - result.setPlaceholder(data.getPlaceholder()); - result.setDialogTittle(data.getDialogTittle()); - result.setDialogWidth(data.getDialogWidth()); - - return result; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5698d2904e918f0dc7a55b3907f933e871080d05..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/DataEntityBuilder.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.lframework.xingyun.template.gen.builders; - -import com.lframework.xingyun.template.gen.components.DataEntity; -import com.lframework.xingyun.template.gen.components.DataEntityColumn; -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.service.GenCreateColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.service.GenDetailColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenQueryColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenQueryParamsColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenUpdateColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenerateInfoService; -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 数据实体Builder - */ -@Component -public class DataEntityBuilder { - - @Autowired - private GenDataEntityService genDataEntityService; - - @Autowired - private GenerateInfoService generateInfoService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Autowired - private GenCreateColumnConfigService genCreateColumnConfigService; - - @Autowired - private GenUpdateColumnConfigService genUpdateColumnConfigService; - - @Autowired - private GenQueryColumnConfigService genQueryColumnConfigService; - - @Autowired - private GenQueryParamsColumnConfigService genQueryParamsColumnConfigService; - - @Autowired - private GenDetailColumnConfigService genDetailColumnConfigService; - - /** - * 根据数据对象ID构建 - * - * @param id - * @return - */ - public DataEntity build(String id) { - - // 根据ID查询数据对象 - GenDataEntity dataEntity = genDataEntityService.findById(id); - DataEntity result = new DataEntity(); - result.setId(dataEntity.getId()); - result.setName(dataEntity.getName()); - result.setDescription(dataEntity.getDescription()); - result.setTable(dataEntity); - result.setColumns(this.buildColumns(dataEntity.getId())); - result.setGenerateInfo(this.buildGenerateInfo(dataEntity.getId())); - - return result; - } - - private GenGenerateInfoDto buildGenerateInfo(String dataObjId) { - - return generateInfoService.getByEntityId(dataObjId); - } - - private List buildColumns(String entityId) { - - List results = new ArrayList<>(); - - List columns = genDataEntityDetailService.getByEntityId(entityId); - for (GenDataEntityDetail column : columns) { - DataEntityColumn result = new DataEntityColumn(); - result.setId(column.getId()); - result.setName(column.getName()); - result.setColumnName(column.getColumnName()); - result.setIsKey(column.getIsKey()); - result.setDataType(column.getDataType()); - result.setColumnOrder(column.getColumnOrder()); - result.setDescription(column.getDescription()); - result.setViewType(column.getViewType()); - result.setTableColumn(column); - result.setFixEnum(column.getFixEnum()); - result.setEnumBack(column.getEnumBack()); - result.setEnumFront(column.getEnumFront()); - result.setRegularExpression(column.getRegularExpression()); - result.setIsOrder(column.getIsOrder()); - if (result.getIsOrder()) { - result.setOrderType(column.getOrderType()); - } - - result.setCreateConfig(genCreateColumnConfigService.findById(column.getId())); - result.setUpdateConfig(genUpdateColumnConfigService.findById(column.getId())); - result.setQueryConfig(genQueryColumnConfigService.findById(column.getId())); - result.setQueryParamsConfig(genQueryParamsColumnConfigService.findById(column.getId())); - result.setDetailConfig(genDetailColumnConfigService.findById(column.getId())); - result.setLen(column.getLen()); - result.setDataDicId(column.getDataDicId()); - result.setCustomSelectorId(column.getCustomSelectorId()); - result.setDecimals(column.getDecimals()); - - results.add(result); - } - - return results; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3287708d082fdfdcc64eed14fb12872f9ce22a99..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/DataObjectBuilder.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.lframework.xingyun.template.gen.builders; - -import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryObj; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryObj.QuerySubTableCondition; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjQueryDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; - -/** - * 数据对象Builder - */ -@Component -public class DataObjectBuilder { - - @Autowired - private GenDataObjService genDataObjService; - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Autowired - private GenDataObjQueryDetailService genDataObjQueryDetailService; - - @Autowired - private GenDataEntityService genDataEntityService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Cacheable(value = DataObjectQueryObj.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - public DataObjectQueryObj buildQueryObj(String id) { - // 先查询配置信息 - GenDataObj data = genDataObjService.findById(id); - - if (data == null) { - throw new DefaultClientException("数据对象不存在！"); - } - - List details = genDataObjDetailService.getByObjId(data.getId()); - List queryDetails = genDataObjQueryDetailService.getByObjId(data.getId()); - - String mainTableId = data.getMainTableId(); - GenDataEntity dataEntity = genDataEntityService.findById(mainTableId); - if (dataEntity == null) { - throw new DefaultClientException("数据实体不存在！"); - } - - List entityDetails = genDataEntityDetailService.getByEntityId(dataEntity.getId()); - - DataObjectQueryObj queryObj = new DataObjectQueryObj(); - List fields = new ArrayList<>(); - - // 主表字段 - if (CollectionUtil.isNotEmpty(entityDetails)) { - for (GenDataEntityDetail entityDetail : entityDetails) { - DataObjectQueryObj.QueryField field = new DataObjectQueryObj.QueryField(); - field.setTableAlias(data.getMainTableAlias()); - field.setColumnName(entityDetail.getDbColumnName()); - field.setColumnAlias(data.getMainTableAlias() + "_" + entityDetail.getDbColumnName()); - field.setDataType(entityDetail.getDataType()); - - fields.add(field); - } - } - - // 子表字段 - if (CollectionUtil.isNotEmpty(details)) { - for (GenDataObjDetail detail : details) { - GenDataEntity subTable = genDataEntityService.findById(detail.getSubTableId()); - List subTableDetails = genDataEntityDetailService.getByEntityId(subTable.getId()); - for (GenDataEntityDetail subTableDetail : subTableDetails) { - DataObjectQueryObj.QueryField field = new DataObjectQueryObj.QueryField(); - field.setTableAlias(detail.getSubTableAlias()); - field.setColumnName(subTableDetail.getDbColumnName()); - field.setColumnAlias(detail.getSubTableAlias() + "_" + subTableDetail.getDbColumnName()); - field.setDataType(subTableDetail.getDataType()); - - fields.add(field); - } - } - } - - // 自定义查询字段 - if (CollectionUtil.isNotEmpty(queryDetails)) { - for (GenDataObjQueryDetail queryDetail : queryDetails) { - DataObjectQueryObj.QueryField field = new DataObjectQueryObj.QueryField(); - field.setColumnName(queryDetail.getCustomSql()); - field.setColumnAlias("custom_" + queryDetail.getCustomAlias()); - field.setDataType(queryDetail.getDataType()); - - fields.add(field); - } - } - - - queryObj.setFields(fields); - queryObj.setMainTable(dataEntity.getTableName()); - queryObj.setMainTableAlias(data.getMainTableAlias()); - - // 关联字表 - List subTables = new ArrayList<>(); - for (GenDataObjDetail detail : details) { - GenDataEntity subTable= genDataEntityService.getById(detail.getSubTableId()); - - DataObjectQueryObj.QuerySubTable querySubTable = new DataObjectQueryObj.QuerySubTable(); - querySubTable.setSubTable(subTable.getTableName()); - querySubTable.setSubTableAlias(detail.getSubTableAlias()); - querySubTable.setJoinType(detail.getRelaMode().getSql()); - - String[] mainTableDetailIds = detail.getMainTableDetailIds().split(StringPool.STR_SPLIT); - String[] subTableDetailIds = detail.getSubTableDetailIds().split(StringPool.STR_SPLIT); - - querySubTable.setJoinCondition(new ArrayList<>()); - - for (int i = 0; i < mainTableDetailIds.length; i++) { - String mainTableDetailId = mainTableDetailIds[i]; - String subTableDetailId = subTableDetailIds[i]; - - GenDataEntityDetail mainTableDetail = genDataEntityDetailService.getById(mainTableDetailId); - GenDataEntityDetail subTableDetail = genDataEntityDetailService.getById(subTableDetailId); - - QuerySubTableCondition condition = new QuerySubTableCondition(); - condition.setKey(mainTableDetail.getDbColumnName()); - condition.setValue(subTableDetail.getDbColumnName()); - querySubTable.getJoinCondition().add(condition); - } - - - - subTables.add(querySubTable); - } - queryObj.setSubTables(subTables); - - return queryObj; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d8a2875fa42b53e856a44c1d9de5deab1924621a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/CreateColumnConfig.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -public interface CreateColumnConfig { - - /** - * 是否必填 - * - * @return - */ - Boolean getRequired(); - - /** - * 排序 - * - * @return - */ - Integer getOrderNo(); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f3b9abbac0e2e53f725786558e6f10e47125c2f3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DataEntity.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import java.util.List; -import lombok.Data; - -/** - * 数据对象 - */ -@Data -public class DataEntity { - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 备注 - */ - private String description; - - /** - * 数据表信息 - */ - private Table table; - - /** - * 字段信息 - */ - private List columns; - - /** - * 配置信息 - */ - private GenGenerateInfoDto generateInfo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5b21b27fd5762afb879464c362482c2f17e9a273..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DataEntityColumn.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenOrderType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import lombok.Data; - -@Data -public class DataEntityColumn { - - /** - * ID - */ - private String id; - - /** - * 字段显示名称 - */ - private String name; - - /** - * 字段名称 - */ - private String columnName; - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 数据类型 - */ - private GenDataType dataType; - - /** - * 排序编号 - */ - private Integer columnOrder; - - /** - * 备注 - */ - private String description; - - /** - * 显示类型 - */ - private GenViewType viewType; - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 后端枚举名 - */ - private String enumBack; - - /** - * 前端枚举名 - */ - private String enumFront; - - /** - * 正则表达式 - */ - private String regularExpression; - - /** - * 是否排序字段 - */ - private Boolean isOrder; - - /** - * 排序类型 - */ - private GenOrderType orderType; - - /** - * 数据表字段信息 - */ - private TableColumn tableColumn; - - /** - * 新增配置 - */ - private CreateColumnConfig createConfig; - - /** - * 修改配置 - */ - private UpdateColumnConfig updateConfig; - - /** - * 查询配置 - */ - private QueryColumnConfig queryConfig; - - /** - * 查询参数配置 - */ - private QueryParamsColumnConfig queryParamsConfig; - - /** - * 详情配置 - */ - private DetailColumnConfig detailConfig; - - /** - * 数据字典ID - */ - private String dataDicId; - - /** - * 自定义选择器ID - */ - private String customSelectorId; - - /** - * 长度 - */ - private Long len; - - /** - * 小数点位数 - */ - private Integer decimals; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index da8d43dba25bbdba26e1999d48acb170eb60f263..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DetailColumnConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -public interface DetailColumnConfig { - - /** - * 列宽 - * - * @return - */ - Integer getSpan(); - - /** - * 排序 - * - * @return - */ - Integer getOrderNo(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f91fbccf2cc127362db744236dc0105a956017d4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/QueryColumnConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; - -public interface QueryColumnConfig { - - /** - * 宽度类型 - * - * @return - */ - GenQueryWidthType getWidthType(); - - /** - * 宽度 - * - * @return - */ - Integer getWidth(); - - /** - * 页面是否排序 - * - * @return - */ - Boolean getSortable(); - - /** - * 排序 - * - * @return - */ - Integer getOrderNo(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4d9e9d08406b1dc7af9601be7e9f0d16112c1b3c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/QueryParamsColumnConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -import com.lframework.xingyun.template.gen.enums.GenQueryType; - -public interface QueryParamsColumnConfig { - - /** - * 查询类型 - * - * @return - */ - GenQueryType getQueryType(); - - /** - * 排序 - * - * @return - */ - Integer getOrderNo(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b477a7c6139f026443fc71ca6f2f5cf7fa60fb77..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/Table.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -import com.lframework.xingyun.template.gen.enums.GenConvertType; - -public interface Table { - - /** - * 获取数据库名 - * - * @return - */ - String getSchema(); - - /** - * 获取数据表名 - * - * @return - */ - String getTableName(); - - /** - * 获取数据表备注 - * - * @return - */ - String getComment(); - - /** - * 获取转换方式 - * - * @return - */ - GenConvertType getConvertType(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f5d23c9998783e03df029792e65fd475bbceef1a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/TableColumn.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -public interface TableColumn { - - /** - * 获取数据表中的字段名称 - * - * @return - */ - String getDbColumnName(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 511eb065e7791202f63bebb0d2b78a0ac7faed19..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/UpdateColumnConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lframework.xingyun.template.gen.components; - -public interface UpdateColumnConfig { - - /** - * 是否必填 - * - * @return - */ - Boolean getRequired(); - - /** - * 排序 - * - * @return - */ - Integer getOrderNo(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b88836ac0893f30e5320618a4861336e34428e14..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/list/CustomListConfig.java +++ /dev/null @@ -1,377 +0,0 @@ -package com.lframework.xingyun.template.gen.components.custom.list; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.VoidDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import lombok.Data; - -@Data -public class CustomListConfig extends BaseBo implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "CustomListConfig"; - - /** - * 工具栏 - */ - @ApiModelProperty("工具栏") - private List toolbars; - - /** - * 查询参数 - */ - @ApiModelProperty("查询参数") - private List queryParams; - - /** - * 操作列 - */ - @ApiModelProperty("操作列") - private List handleColumns; - - /** - * 列表配置 - */ - @ApiModelProperty("列表配置") - private ListConfig listConfig; - - - @Data - public static class QueryParam implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 表别名 - */ - @ApiModelProperty("表别名") - private String tableAlias; - - /** - * 字段名称 - */ - @ApiModelProperty("字段名称") - private String columnName; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - private String name; - - /** - * 前端显示 - */ - @ApiModelProperty("前端显示") - private Boolean frontShow; - - /** - * 查询类型 - */ - @ApiModelProperty("查询类型") - private Integer queryType; - - /** - * 表单宽度 - */ - @ApiModelProperty("表单宽度") - private Integer formWidth; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private Integer viewType; - - /** - * 数据类型 - */ - @ApiModelProperty("数据类型") - private Integer dataType; - - /** - * 是否内置枚举 - */ - @ApiModelProperty("是否内置枚举") - private Boolean fixEnum; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - @ApiModelProperty("前端字段类型 只有字段是枚举时生效，此值为前端枚举类型") - private String frontType; - - /** - * 是否包含状态Tag - */ - @ApiModelProperty("是否包含状态Tag") - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 数据字典Code - */ - @ApiModelProperty("数据字典Code") - private String dataDicCode; - - /** - * 自定义选择器ID - */ - @ApiModelProperty("自定义选择器ID") - private String customSelectorId; - - /** - * 默认值 - */ - @ApiModelProperty("默认值") - private Object defaultValue; - } - - @Data - public static class ListConfig implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 列表类型 - */ - @ApiModelProperty("列表类型") - private Integer listType; - - /** - * 表单宽度列表 - */ - @ApiModelProperty("表单宽度列表") - private Integer labelWidth; - - /** - * 是否分页 - */ - @ApiModelProperty("是否分页") - private Boolean hasPage; - - /** - * 是否树形列表 - */ - @ApiModelProperty("是否树形列表") - private Boolean treeData; - - /** - * ID字段 - */ - @ApiModelProperty("ID字段") - private String idColumn; - - /** - * 父级ID字段 - */ - @ApiModelProperty("父级ID字段") - private String treePidColumn; - - /** - * 树形节点字段 - */ - @ApiModelProperty("树形节点字段") - private String treeNodeColumn; - - /** - * 子节点Key值 - */ - @ApiModelProperty("子节点Key值") - private String treeChildrenKey; - - /** - * 是否允许导出 - */ - @ApiModelProperty("是否允许导出") - private Boolean allowExport; - - /** - * 字段 - */ - @ApiModelProperty("字段") - private List fields; - } - - @Data - public static class FieldConfig implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - private String name; - - /** - * 字段名称 - */ - @ApiModelProperty("字段名称") - private String columnName; - - /** - * 宽度类型 - */ - @ApiModelProperty("宽度类型") - private Integer widthType; - - /** - * 宽度 - */ - @ApiModelProperty("宽度") - private Integer width; - - /** - * 是否页面排序 - */ - @ApiModelProperty("是否页面排序") - private Boolean sortable; - - /** - * 是否数字类型 - */ - @ApiModelProperty("是否数字类型") - private Boolean isNumberType = Boolean.FALSE; - - /** - * 是否包含状态Tag - */ - @ApiModelProperty("是否包含状态Tag") - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 是否内置枚举 - */ - @ApiModelProperty("是否内置枚举") - private Boolean fixEnum; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - @ApiModelProperty("前端字段类型 只有字段是枚举时生效，此值为前端枚举类型") - private String frontType; - - /** - * 数据类型 - */ - @ApiModelProperty("数据类型") - private Integer dataType; - - /** - * 格式化脚本 - */ - @ApiModelProperty("格式化脚本") - private String formatter; - } - - @Data - public static class Toolbar implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - private String name; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private String viewType; - - /** - * 按钮类型 - */ - @ApiModelProperty("按钮类型") - private Integer btnType; - - /** - * 按钮配置 - */ - @ApiModelProperty("按钮配置") - private String btnConfig; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 请求参数 - */ - @ApiModelProperty("请求参数") - private String requestParam; - } - - @Data - public static class HandleColumn implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - private String name; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - private String viewType; - - /** - * 按钮类型 - */ - @ApiModelProperty("按钮类型") - private Integer btnType; - - /** - * 按钮配置 - */ - @ApiModelProperty("按钮配置") - private String btnConfig; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 宽度 - */ - @ApiModelProperty("宽度") - private Integer width; - - /** - * 请求参数 - */ - @ApiModelProperty("请求参数") - private String requestParam; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9feb8d25c83d45821cd4f8141b9778882810a4df..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/page/CustomPageConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.components.custom.page; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.VoidDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class CustomPageConfig extends BaseBo implements Serializable { - - public static final String CACHE_NAME = "CustomPageConfig"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private Integer id; - - /** - * 组件配置 - */ - @ApiModelProperty("组件配置") - private String componentConfig; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7d8be968a401fcd8e163ca9b36029ba168493a61..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/selector/CustomSelectorConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lframework.xingyun.template.gen.components.custom.selector; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.VoidDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class CustomSelectorConfig extends BaseBo implements Serializable { - - public static final String CACHE_NAME = "CustomSelectorConfig"; - - private static final long serialVersionUID = 1L; - - /** - * 自定义列表ID - */ - @ApiModelProperty("自定义列表ID") - private String customListId; - - /** - * ID字段 - */ - @ApiModelProperty("ID字段") - private String idColumn; - - /** - * 名称字段 - */ - @ApiModelProperty("名称字段") - private String nameColumn; - - /** - * 占位符 - */ - @ApiModelProperty("占位符") - private String placeholder; - - /** - * 对话框标题 - */ - @ApiModelProperty("对话框标题") - private String dialogTittle; - - /** - * 对话框宽度 - */ - @ApiModelProperty("对话框宽度") - private String dialogWidth; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 381488b998d0712e08ae05f508b2338783f060f3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryObj.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.lframework.xingyun.template.gen.components.data.obj; - -import com.lframework.xingyun.template.gen.enums.GenDataType; -import java.io.Serializable; -import java.util.List; -import lombok.Data; - -@Data -public class DataObjectQueryObj implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "DataObjectQueryObj"; - - /** - * SQL的SELECT部分 - */ - private List fields; - - /** - * 主表 FROM部分 - */ - private String mainTable; - - /** - * 主表别名 - */ - private String mainTableAlias; - - /** - * 关联的子表 - */ - private List subTables; - - /** - * 查询参数 - */ - private DataObjectQueryParamObj queryParamObj; - - /** - * 查询前置SQL - */ - private String queryPrefixSql; - - /** - * 查询后置SQL - */ - private String querySuffixSql; - - /** - * 后置SQL - */ - private String suffixSql; - - @Data - public static class QueryField implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 表别名 如果此值为空，代表为自定义查询字段 - */ - private String tableAlias; - - /** - * 字段名 - */ - private String columnName; - - /** - * 字段别名 - */ - private String columnAlias; - - /** - * 数据类型 - */ - private GenDataType dataType; - } - - @Data - public static class QuerySubTable implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 子表 - */ - private String subTable; - - /** - * 子表别名 - */ - private String subTableAlias; - - /** - * 关联方式 - */ - private String joinType; - - /** - * 关联条件 key：主表字段 value：子表字段 - */ - private List joinCondition; - } - - @Data - public static class QuerySubTableCondition implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 左侧字段 - */ - private String key; - - /** - * 右侧字段 - */ - private String value; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index cfa7bec39773f69da34686dfde4ed667a78940a6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryParamObj.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lframework.xingyun.template.gen.components.data.obj; - -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.vo.PageVo; -import java.util.List; -import lombok.Data; - -@Data -public class DataObjectQueryParamObj extends PageVo { - - /** - * 条件 - */ - private List conditions; - - @Data - public static class Condition { - /** - * 表别名 - */ - private String tableAlias; - - /** - * 字段名 - */ - private String columnName; - - /** - * 查询类型 - */ - private Integer queryType; - - /** - * 值前缀 - */ - private String valuePrefix; - - /** - * 值 - */ - private Object value; - - /** - * 值集合 - */ - private List values; - - /** - * 值后缀 - */ - private String valueSuffix; - - public String getQueryTypeSql() { - return EnumUtil.getByCode(GenQueryType.class, this.queryType).getOperation(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7bef36e5eacf95e458fb0765d107fd04fd74a566..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.template.gen.components.magic; - -import com.lframework.starter.common.utils.ArrayUtil; -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; -import org.springframework.stereotype.Component; -import org.ssssssss.magicapi.core.context.MagicUser; -import org.ssssssss.magicapi.core.exception.MagicLoginException; -import org.ssssssss.magicapi.core.interceptor.Authorization; -import org.ssssssss.magicapi.core.interceptor.AuthorizationInterceptor; -import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest; - -/** - * 自定义用户名密码登录 - */ -@Component //注入到Spring容器中 -public class MagicCustomAuthorizationInterceptor implements AuthorizationInterceptor { - - @Autowired - private CheckPermissionHandler checkPermissionHandler; - - /** - * 配置是否需要登录 - */ - @Override - public boolean requireLogin() { - return false; - } - - /** - * 根据Token获取User - */ - @Override - public MagicUser getUserByToken(String token) throws MagicLoginException { - AbstractUserDetails currentUser = SecurityUtil.getUserByToken(token); - if (currentUser == null) { - throw new MagicLoginException("请重新登录！"); - } - - return new MagicUser(currentUser.getId(), currentUser.getName(), token); - } - - @Override - public MagicUser login(String username, String password) throws MagicLoginException { - throw new MagicLoginException("不支持手动登录，请先登录主系统！"); - } - - @Override - public boolean allowVisit(MagicUser magicUser, MagicHttpServletRequest request, - Authorization authorization) { - - String[] profiles = ApplicationUtil.getEnv().getActiveProfiles(); - if (ArrayUtil.isNotEmpty(profiles) && ArrayUtil.contains(profiles, "demo")) { - return authorization == Authorization.VIEW; - } - return checkPermissionHandler.valid(PermissionCalcType.OR, "system:online-code:config"); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5842a296d4b3122e8b7c5929fe31a70bf7d67001..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomJsonValueProvider.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.components.magic; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.resp.InvokeResultBuilder; -import java.util.List; -import java.util.Map; -import org.springframework.stereotype.Component; -import org.ssssssss.magicapi.core.context.RequestEntity; -import org.ssssssss.magicapi.core.interceptor.ResultProvider; -import org.ssssssss.magicapi.modules.db.model.Page; - -@Component -public class MagicCustomJsonValueProvider implements ResultProvider { - - /** - * 定义返回结果，默认返回JsonBean - */ - @Override - public Object buildResult(RequestEntity requestEntity, int code, String message, Object data) { - if (code >= 200 && code <= 299) { - return InvokeResultBuilder.success(data); - } else { - throw new DefaultClientException(message); - } - } - - /** - * 定义分页返回结果，该项会被封装在Json结果内， 此方法可以不覆盖，默认返回PageResult - */ - @Override - public Object buildPageResult(RequestEntity requestEntity, Page page, long total, - List> data) { - - return PageResultUtil.newInstance(page.getOffset() / page.getLimit() + 1, page.getLimit(), - total, data); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1a1044305636c80c726d56c057d7c573224f1b16..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.components.magic; - -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; -import org.ssssssss.script.annotation.Function; - -@Component -public class MagicCustomMagicFunction implements MagicFunction { - - @Function - @Comment("获取登录人ID") - public static AbstractUserDetails current_user() { - AbstractUserDetails user = SecurityUtil.getCurrentUser(); - return user; - } - - @Function - @Comment("获取租户ID") - public static String current_tenant_id() { - return TenantContextHolder.getTenantId() == null ? null - : TenantContextHolder.getTenantId().toString(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0dd1d2bf979a951965ac4b0bf57983e583c1aa58..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomSqlCache.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.components.magic; - -import com.lframework.starter.web.components.redis.RedisHandler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.ssssssss.magicapi.modules.db.cache.SqlCache; - -@Component -public class MagicCustomSqlCache implements SqlCache { - - @Autowired - private RedisHandler redisHandler; - - @Override - public void put(String name, String key, Object value) { - redisHandler.hset(name, key, value); - } - - @Override - public void put(String name, String key, Object value, long ttl) { - redisHandler.hset(name, key, value, ttl); - } - - @Override - public T get(String name, String key) { - return (T) redisHandler.hget(name, key); - } - - @Override - public void delete(String name) { - redisHandler.hdel(name); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index db4ae7238f51634508e0105a3aa52bc8c290b131..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/config/MagicCustomConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.template.gen.config; - -import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.baomidou.dynamic.datasource.creator.BasicDataSourceCreator; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.web.config.properties.SecretProperties; -import com.lframework.starter.web.utils.DataSourceUtil; -import com.lframework.starter.web.utils.EncryptUtil; -import com.lframework.xingyun.template.inner.entity.Tenant; -import com.lframework.xingyun.template.inner.service.TenantService; -import java.util.List; -import java.util.Map; -import javax.sql.DataSource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.TaskScheduler; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.ssssssss.magicapi.datasource.model.MagicDynamicDataSource; - -@Configuration -public class MagicCustomConfiguration { - - @Autowired - private DynamicDataSourceProperties dynamicDataSourceProperties; - - @Bean - public TaskScheduler taskScheduler() { - ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler(); - taskScheduler.setPoolSize(10); - taskScheduler.initialize(); - return taskScheduler; - } - - @Bean - public MagicDynamicDataSource magicDynamicDataSource(DynamicRoutingDataSource dataSource, - TenantService tenantService, BasicDataSourceCreator basicDataSourceCreator, SecretProperties secretProperties) { - Map dataSourceMap = dataSource.getDataSources(); - MagicDynamicDataSource dynamicDataSource = new MagicDynamicDataSource(); - dynamicDataSource.setDefault(dataSourceMap.get("master")); - - DataSourceProperty dataSourceProperty = dynamicDataSourceProperties.getDatasource() - .get("master"); - // 这里只加载启用的租户 - Wrapper queryWrapper = Wrappers.lambdaQuery(Tenant.class) - .eq(Tenant::getAvailable, Boolean.TRUE); - List tenants = tenantService.list(queryWrapper); - - for (Tenant tenant : tenants) { - dynamicDataSource.add(String.valueOf(tenant.getId()), - basicDataSourceCreator.createDataSource( - DataSourceUtil.createDataSourceProperty(dataSourceProperty, tenant.getJdbcUrl(), - tenant.getJdbcUsername(), EncryptUtil.decrypt(tenant.getJdbcPassword(), secretProperties)))); - } - - return dynamicDataSource; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fc10d8d1dc11ac4fb0a997398e2c64169c121142..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/constants/GenStringPool.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.lframework.xingyun.template.gen.constants; - -public interface GenStringPool { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 46ccd9cbbf379dc469a0de6106bdd63b149a538a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenController.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import cn.hutool.core.convert.Convert; -import com.github.pagehelper.PageInfo; -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.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.gen.builders.CustomListBuilder; -import com.lframework.xingyun.template.gen.builders.CustomPageBuilder; -import com.lframework.xingyun.template.gen.builders.CustomSelectorBuilder; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig; -import com.lframework.xingyun.template.gen.components.custom.page.CustomPageConfig; -import com.lframework.xingyun.template.gen.components.custom.selector.CustomSelectorConfig; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryObj; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryParamObj; -import com.lframework.xingyun.template.gen.mappers.GenMapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.extern.slf4j.Slf4j; -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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 提供低代码相关功能所需的接口 - */ -@Slf4j -@Api(tags = "低代码接口") -@Validated -@RestController -@RequestMapping("/gen/api") -public class GenController extends DefaultBaseController { - - @Autowired - private CustomListBuilder customListBuilder; - - @Autowired - private CustomSelectorBuilder customSelectorBuilder; - - @Autowired - private GenMapper genMapper; - - @Autowired - private CustomPageBuilder customPageBuilder; - - @ApiOperation("自定义列表配置") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping("/custom/list/config") - public InvokeResult getCustomListConfig( - @NotBlank(message = "ID不能为空！") String id) { - - CustomListConfig config = customListBuilder.buildConfig(id); - - return InvokeResultBuilder.success(config); - } - - @ApiOperation("查询自定义列表数据（分页）") - @PostMapping("/custom/list/query") - public InvokeResult>> customListQueryPage( - @NotBlank(message = "ID不能为空！") String id, - @RequestBody DataObjectQueryParamObj vo) { - - DataObjectQueryObj queryObj = customListBuilder.buildQueryObj(id, vo); - - PageHelperUtil.startPage(vo); - List> datas = genMapper.findList(queryObj); - PageResult> pageResult = PageResultUtil.convert(new PageInfo<>(datas)); - - for (DataObjectQueryObj.QueryField field : queryObj.getFields()) { - for (Map data : datas) { - Object oriValue = data.get(field.getColumnAlias()); - Object newValue = Convert.convert(field.getDataType().getClazz(), - data.get(field.getColumnAlias())); - data.put(field.getColumnAlias(), newValue == null ? oriValue : newValue); - } - } - - return InvokeResultBuilder.success(pageResult); - } - - @ApiOperation("查询自定义列表数据（不分页）") - @PostMapping("/custom/list/query/list") - public InvokeResult>> customListQueryList( - @NotBlank(message = "ID不能为空！") String id, - @RequestBody DataObjectQueryParamObj vo) { - - DataObjectQueryObj queryObj = customListBuilder.buildQueryObj(id, vo); - - List> datas = genMapper.findList(queryObj); - - for (DataObjectQueryObj.QueryField field : queryObj.getFields()) { - for (Map data : datas) { - Object oriValue = data.get(field.getColumnAlias()); - Object newValue = Convert.convert(field.getDataType().getClazz(), - data.get(field.getColumnAlias())); - data.put(field.getColumnAlias(), newValue == null ? oriValue : newValue); - } - } - - return InvokeResultBuilder.success(datas); - } - - @ApiOperation("查询自定义列表数据（树形）") - @PostMapping("/custom/list/query/tree") - public InvokeResult>> customListQueryTree( - @NotBlank(message = "ID不能为空！") String id, - @RequestBody DataObjectQueryParamObj vo) { - - // 查询全量数据 - DataObjectQueryObj queryObj = customListBuilder.buildQueryObj(id, null); - - List> datas = genMapper.findList(queryObj); - - for (DataObjectQueryObj.QueryField field : queryObj.getFields()) { - for (Map data : datas) { - Object oriValue = data.get(field.getColumnAlias()); - Object newValue = Convert.convert(field.getDataType().getClazz(), - data.get(field.getColumnAlias())); - data.put(field.getColumnAlias(), newValue == null ? oriValue : newValue); - } - } - - if (CollectionUtil.isEmpty(datas)) { - return InvokeResultBuilder.success(datas); - } - - DataObjectQueryObj filterQueryObj = customListBuilder.buildQueryObj(id, vo); - List> filterDatas = genMapper.findList(filterQueryObj); - - CustomListConfig config = customListBuilder.buildConfig(id); - String idColumn = config.getListConfig().getIdColumn(); - List ids = filterDatas.stream().map(t -> String.valueOf(t.get(idColumn))).collect( - Collectors.toList()); - datas.stream().filter(t -> ids.contains(String.valueOf(t.get(idColumn)))) - .forEach(t -> t.put("id@show", true)); - - return InvokeResultBuilder.success(datas); - } - - @ApiOperation("自定义选择器配置") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping("/custom/selector/config") - public InvokeResult getCustomSelectorConfig( - @NotBlank(message = "ID不能为空！") String id) { - - CustomSelectorConfig config = customSelectorBuilder.buildConfig(id); - - return InvokeResultBuilder.success(config); - } - - @ApiOperation("获取自定义页面配置") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping("/custom/page/config") - public InvokeResult get(@NotNull(message = "ID不能为空！") Integer id) { - - CustomPageConfig config = customPageBuilder.buildConfig(id); - - return InvokeResultBuilder.success(config); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1ab51188520428a9dabaf6153df36d88ddca08de..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListCategoryController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.xingyun.template.gen.service.GenCustomListCategoryService; -import com.lframework.xingyun.template.gen.vo.custom.list.category.CreateGenCustomListCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.list.category.UpdateGenCustomListCategoryVo; -import com.lframework.xingyun.template.gen.bo.custom.list.category.GetGenCustomListCategoryBo; -import com.lframework.xingyun.template.gen.bo.custom.list.category.QueryGenCustomListCategoryBo; -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 java.util.Arrays; -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.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 自定义列表分类 - * - * @author zmj - */ -@Api(tags = "自定义列表分类") -@Validated -@RestController -@RequestMapping("/gen/custom/list/category") -public class GenCustomListCategoryController extends DefaultBaseController { - - @Autowired - private GenCustomListCategoryService genCustomListCategoryService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @GetMapping("/query") - public InvokeResult> query() { - List datas = genCustomListCategoryService.queryList(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryGenCustomListCategoryBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenCustomListCategory data = genCustomListCategoryService.findById(id); - if (data == null) { - throw new DefaultClientException("自定义列表分类不存在！"); - } - - GetGenCustomListCategoryBo result = new GetGenCustomListCategoryBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增自定义列表分类 - */ - @ApiOperation("新增自定义列表分类") - @PostMapping - public InvokeResult create(@Valid CreateGenCustomListCategoryVo vo) { - - genCustomListCategoryService.create(vo); - - genCustomListCategoryService.cleanCacheByKey("all"); - - return InvokeResultBuilder.success(); - } - - /** - * 修改自定义列表分类 - */ - @ApiOperation("修改自定义列表分类") - @PutMapping - public InvokeResult update(@Valid UpdateGenCustomListCategoryVo vo) { - - genCustomListCategoryService.update(vo); - - genCustomListCategoryService.cleanCacheByKeys(Arrays.asList("all", vo.getId())); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("删除自定义列表分类") - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genCustomListCategoryService.deleteById(id); - - genCustomListCategoryService.cleanCacheByKeys(Arrays.asList("all", id)); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 903a493046e53bbddbac1ae42175d3e65262836a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.vo.custom.list.CreateGenCustomListVo; -import com.lframework.xingyun.template.gen.vo.custom.list.QueryGenCustomListVo; -import com.lframework.xingyun.template.gen.vo.custom.list.UpdateGenCustomListVo; -import com.lframework.xingyun.template.gen.bo.custom.list.GetGenCustomListBo; -import com.lframework.xingyun.template.gen.bo.custom.list.QueryGenCustomListBo; -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.NotBlank; -import javax.validation.constraints.NotEmpty; -import lombok.extern.slf4j.Slf4j; -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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "自定义列表") -@Slf4j -@Validated -@RestController -@RequestMapping("/gen/custom/list") -public class GenCustomListController extends DefaultBaseController { - - @Autowired - private GenCustomListService genCustomListService; - - @ApiOperation("查询自定义列表") - @GetMapping("/query") - public InvokeResult> query(@Valid QueryGenCustomListVo vo) { - - PageResult pageResult = genCustomListService.query(getPageIndex(vo), - getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(QueryGenCustomListBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenCustomList data = genCustomListService.findById(id); - - return InvokeResultBuilder.success(new GetGenCustomListBo(data)); - } - - @ApiOperation("新增") - @PostMapping - public InvokeResult create(@RequestBody @Valid CreateGenCustomListVo vo) { - - genCustomListService.create(vo); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("修改") - @PutMapping - public InvokeResult update(@RequestBody @Valid UpdateGenCustomListVo vo) { - - genCustomListService.update(vo); - - genCustomListService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genCustomListService.delete(id); - - genCustomListService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("启用") - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genCustomListService.enable(id); - - genCustomListService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("停用") - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genCustomListService.unable(id); - - genCustomListService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 61aca3c1375edc1e1df35d4dfc9dfc8d07b362ea..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageCategoryController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.bo.custom.page.category.GetGenCustomPageCategoryBo; -import com.lframework.xingyun.template.gen.bo.custom.page.category.QueryGenCustomPageCategoryBo; -import com.lframework.xingyun.template.gen.service.GenCustomPageCategoryService; -import com.lframework.xingyun.template.gen.vo.custom.page.category.CreateGenCustomPageCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.page.category.UpdateGenCustomPageCategoryVo; -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -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 java.util.Arrays; -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.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 自定义页面分类 - * - * @author zmj - */ -@Api(tags = "自定义页面分类") -@Validated -@RestController -@RequestMapping("/gen/custom/page/category") -public class GenCustomPageCategoryController extends DefaultBaseController { - - @Autowired - private GenCustomPageCategoryService genCustomPageCategoryService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @GetMapping("/query") - public InvokeResult> query() { - List datas = genCustomPageCategoryService.queryList(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryGenCustomPageCategoryBo::new) - .collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get( - @NotBlank(message = "ID不能为空！") String id) { - - GenCustomPageCategory data = genCustomPageCategoryService.findById(id); - if (data == null) { - throw new DefaultClientException("自定义页面分类不存在！"); - } - - GetGenCustomPageCategoryBo result = new GetGenCustomPageCategoryBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增自定义页面分类 - */ - @ApiOperation("新增自定义页面分类") - @PostMapping - public InvokeResult create(@Valid CreateGenCustomPageCategoryVo vo) { - - genCustomPageCategoryService.create(vo); - - genCustomPageCategoryService.cleanCacheByKey("all"); - - return InvokeResultBuilder.success(); - } - - /** - * 修改自定义页面分类 - */ - @ApiOperation("修改自定义页面分类") - @PutMapping - public InvokeResult update(@Valid UpdateGenCustomPageCategoryVo vo) { - - genCustomPageCategoryService.update(vo); - - genCustomPageCategoryService.cleanCacheByKeys(Arrays.asList("all", vo.getId())); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("删除自定义页面分类") - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genCustomPageCategoryService.deleteById(id); - - genCustomPageCategoryService.cleanCacheByKeys(Arrays.asList("all", id)); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 005f1cde526f71c7296cb7692d628abd3fc9f68c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java +++ /dev/null @@ -1,100 +0,0 @@ -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 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 lombok.extern.slf4j.Slf4j; -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; - -@Api(tags = "自定义页面") -@Slf4j -@Validated -@RestController -@RequestMapping("/gen/custom/page") -public class GenCustomPageController extends DefaultBaseController { - - @Autowired - private GenCustomPageService genCustomPageService; - - @ApiOperation("查询自定义页面") - @GetMapping("/query") - public InvokeResult> query(@Valid QueryGenCustomPageVo vo) { - - PageResult pageResult = genCustomPageService.query(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(QueryGenCustomPageBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult getConfig(@NotNull(message = "ID不能为空！") Integer id) { - - GenCustomPage data = genCustomPageService.findById(id); - - return InvokeResultBuilder.success(new GetGenCustomPageBo(data)); - } - - @ApiOperation("新增") - @PostMapping - public InvokeResult create(@RequestBody @Valid CreateGenCustomPageVo vo) { - - genCustomPageService.create(vo); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("修改") - @PutMapping - public InvokeResult update(@RequestBody @Valid UpdateGenCustomPageVo vo) { - - genCustomPageService.update(vo); - - genCustomPageService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @DeleteMapping - public InvokeResult delete(@NotNull(message = "ID不能为空！") Integer id) { - - genCustomPageService.delete(id); - - genCustomPageService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5975d1e946eae97dfb471bdb0ccffbd9f04ec268..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorCategoryController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorCategoryService; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.CreateGenCustomSelectorCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.UpdateGenCustomSelectorCategoryVo; -import com.lframework.xingyun.template.gen.bo.custom.selector.category.GetGenCustomSelectorCategoryBo; -import com.lframework.xingyun.template.gen.bo.custom.selector.category.QueryGenCustomSelectorCategoryBo; -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -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 java.util.Arrays; -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.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 自定义选择器分类 - * - * @author zmj - */ -@Api(tags = "自定义选择器分类") -@Validated -@RestController -@RequestMapping("/gen/custom/selector/category") -public class GenCustomSelectorCategoryController extends DefaultBaseController { - - @Autowired - private GenCustomSelectorCategoryService genCustomSelectorCategoryService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @GetMapping("/query") - public InvokeResult> query() { - List datas = genCustomSelectorCategoryService.queryList(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryGenCustomSelectorCategoryBo::new) - .collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get( - @NotBlank(message = "ID不能为空！") String id) { - - GenCustomSelectorCategory data = genCustomSelectorCategoryService.findById(id); - if (data == null) { - throw new DefaultClientException("自定义选择器分类不存在！"); - } - - GetGenCustomSelectorCategoryBo result = new GetGenCustomSelectorCategoryBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增自定义选择器分类 - */ - @ApiOperation("新增自定义选择器分类") - @PostMapping - public InvokeResult create(@Valid CreateGenCustomSelectorCategoryVo vo) { - - genCustomSelectorCategoryService.create(vo); - - genCustomSelectorCategoryService.cleanCacheByKey("all"); - - return InvokeResultBuilder.success(); - } - - /** - * 修改自定义选择器分类 - */ - @ApiOperation("修改自定义选择器分类") - @PutMapping - public InvokeResult update(@Valid UpdateGenCustomSelectorCategoryVo vo) { - - genCustomSelectorCategoryService.update(vo); - - genCustomSelectorCategoryService.cleanCacheByKeys(Arrays.asList("all", vo.getId())); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("删除自定义选择器分类") - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genCustomSelectorCategoryService.deleteById(id); - - genCustomSelectorCategoryService.cleanCacheByKeys(Arrays.asList("all", id)); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 840eb843d0e4680cb8806f2bd4ce78f2085a1b1d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.vo.custom.selector.CreateGenCustomSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.QueryGenCustomSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.UpdateGenCustomSelectorVo; -import com.lframework.xingyun.template.gen.bo.custom.selector.GetGenCustomSelectorBo; -import com.lframework.xingyun.template.gen.bo.custom.selector.QueryGenCustomSelectorBo; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -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.NotBlank; -import javax.validation.constraints.NotEmpty; -import lombok.extern.slf4j.Slf4j; -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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "自定义选择器") -@Slf4j -@Validated -@RestController -@RequestMapping("/gen/custom/selector") -public class GenCustomSelectorController extends DefaultBaseController { - - @Autowired - private GenCustomSelectorService genCustomSelectorService; - - @ApiOperation("查询自定义选择器") - @GetMapping("/query") - public InvokeResult> query( - @Valid QueryGenCustomSelectorVo vo) { - - PageResult pageResult = genCustomSelectorService.query(getPageIndex(vo), - getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(QueryGenCustomSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenCustomSelector data = genCustomSelectorService.findById(id); - - return InvokeResultBuilder.success(new GetGenCustomSelectorBo(data)); - } - - @ApiOperation("新增") - @PostMapping - public InvokeResult create(@RequestBody @Valid CreateGenCustomSelectorVo vo) { - - genCustomSelectorService.create(vo); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("修改") - @PutMapping - public InvokeResult update(@RequestBody @Valid UpdateGenCustomSelectorVo vo) { - - genCustomSelectorService.update(vo); - - genCustomSelectorService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genCustomSelectorService.delete(id); - - genCustomSelectorService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("启用") - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genCustomSelectorService.enable(id); - - genCustomSelectorService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("停用") - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genCustomSelectorService.unable(id); - - genCustomSelectorService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 263be1f1ed5ea9ac0d4a1181782bcd1c90baf32f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityCategoryController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.xingyun.template.gen.service.GenDataEntityCategoryService; -import com.lframework.xingyun.template.gen.vo.data.entity.category.CreateGenDataEntityCategoryVo; -import com.lframework.xingyun.template.gen.vo.data.entity.category.UpdateGenDataEntityCategoryVo; -import com.lframework.xingyun.template.gen.bo.data.entity.category.GetGenDataEntityCategoryBo; -import com.lframework.xingyun.template.gen.bo.data.entity.category.QueryGenDataEntityCategoryBo; -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 java.util.Arrays; -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.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据实体分类 - * - * @author zmj - */ -@Api(tags = "数据实体分类") -@Validated -@RestController -@RequestMapping("/gen/data/entity/category") -public class GenDataEntityCategoryController extends DefaultBaseController { - - @Autowired - private GenDataEntityCategoryService genDataEntityCategoryService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @GetMapping("/query") - public InvokeResult> query() { - List datas = genDataEntityCategoryService.queryList(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryGenDataEntityCategoryBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenDataEntityCategory data = genDataEntityCategoryService.findById(id); - if (data == null) { - throw new DefaultClientException("数据实体分类不存在！"); - } - - GetGenDataEntityCategoryBo result = new GetGenDataEntityCategoryBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增数据实体分类 - */ - @ApiOperation("新增数据实体分类") - @PostMapping - public InvokeResult create(@Valid CreateGenDataEntityCategoryVo vo) { - - genDataEntityCategoryService.create(vo); - - genDataEntityCategoryService.cleanCacheByKey("all"); - - return InvokeResultBuilder.success(); - } - - /** - * 修改数据实体分类 - */ - @ApiOperation("修改数据实体分类") - @PutMapping - public InvokeResult update(@Valid UpdateGenDataEntityCategoryVo vo) { - - genDataEntityCategoryService.update(vo); - - genDataEntityCategoryService.cleanCacheByKeys(Arrays.asList("all", vo.getId())); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("删除数据实体分类") - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genDataEntityCategoryService.deleteById(id); - - genDataEntityCategoryService.cleanCacheByKeys(Arrays.asList("all", id)); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5bbfd9019f9909e0fc308d4d26fe74b0dc4bc7ef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java +++ /dev/null @@ -1,289 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.FileUtil; -import com.lframework.starter.common.utils.ThreadUtil; -import com.lframework.starter.common.utils.ZipUtil; -import com.lframework.xingyun.template.gen.converters.GenStringConverter; -import com.lframework.xingyun.template.gen.converters.GenViewTypeConverter; -import com.lframework.xingyun.template.gen.dto.data.entity.DataEntityGenerateDto; -import com.lframework.xingyun.template.gen.dto.generate.GenerateDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.generate.Generator; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import com.lframework.xingyun.template.gen.service.SimpleTableColumnService; -import com.lframework.xingyun.template.gen.vo.data.entity.CreateDataEntityVo; -import com.lframework.xingyun.template.gen.vo.data.entity.QueryDataEntityVo; -import com.lframework.xingyun.template.gen.vo.data.entity.UpdateDataEntityGenerateVo; -import com.lframework.xingyun.template.gen.vo.data.entity.UpdateDataEntityVo; -import com.lframework.xingyun.template.gen.vo.simpledb.QuerySimpleTableColumnVo; -import com.lframework.xingyun.template.gen.bo.data.entity.DataEntityGenerateBo; -import com.lframework.xingyun.template.gen.bo.data.entity.GenDataEntityDetailBo; -import com.lframework.xingyun.template.gen.bo.data.entity.GetDataEntityBo; -import com.lframework.xingyun.template.gen.bo.data.entity.QueryDataEntityBo; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -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 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; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import java.io.File; -import java.nio.charset.StandardCharsets; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import javax.validation.Valid; -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.beans.factory.annotation.Value; -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; - -@Api(tags = "数据实体") -@Slf4j -@Validated -@RestController -@RequestMapping("/gen/data/entity") -public class GenDataEntityController extends DefaultBaseController { - - @Autowired - private GenDataEntityService genDataEntityService; - - @Autowired - private SimpleTableColumnService simpleTableColumnService; - - @Autowired - private GenViewTypeConverter genViewTypeConverter; - - /** - * 上传文件的临时文件目录 - */ - @Value("${spring.servlet.multipart.location}") - private String location; - - @ApiOperation("查询数据对象列表") - @GetMapping("/query") - public InvokeResult> query(@Valid QueryDataEntityVo vo) { - - PageResult pageResult = genDataEntityService.query(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(QueryDataEntityBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - @ApiOperation("查询列信息") - @GetMapping("/query/columns") - public InvokeResult> getColumns(@Valid QuerySimpleTableColumnVo vo) { - List datas = simpleTableColumnService.query(vo); - if (CollectionUtil.isEmpty(datas)) { - throw new DefaultClientException("数据表不存在，请检查！"); - } - List details = datas.stream().map(t -> { - GenDataEntityDetail detail = new GenDataEntityDetail(); - detail.setId(t.getDbColumnName()); - detail.setName(t.getColumnComment()); - detail.setColumnName(GenStringConverter.convertToCamelCase(GenConvertType.UNDERLINE_TO_CAMEL, - t.getDbColumnName())); - detail.setIsKey(t.getIsKey()); - detail.setDataType(t.getDataType()); - detail.setColumnOrder(t.getOrdinalPosition()); - List viewTypes = genViewTypeConverter.convert(t.getDataType()); - if (CollectionUtil.isEmpty(viewTypes)) { - throw new DefaultClientException("字段：" + t.getDbColumnName() + "类型暂不支持！"); - } - detail.setViewType(viewTypes.get(0)); - detail.setFixEnum(Boolean.FALSE); - detail.setIsOrder(Boolean.FALSE); - detail.setLen(t.getLen()); - detail.setDecimals(t.getDecimals()); - - return detail; - }).collect(Collectors.toList()); - - List results = details.stream().map(GenDataEntityDetailBo::new).collect( - Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenDataEntity data = genDataEntityService.findById(id); - - return InvokeResultBuilder.success(new GetDataEntityBo(data)); - } - - @ApiOperation("新增") - @PostMapping - public InvokeResult create(@RequestBody @Valid CreateDataEntityVo vo) { - - genDataEntityService.create(vo); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("修改") - @PutMapping - public InvokeResult update(@RequestBody @Valid UpdateDataEntityVo vo) { - - genDataEntityService.update(vo); - - this.evictRelaCache(vo.getId()); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genDataEntityService.delete(id); - - this.evictRelaCache(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("启用") - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genDataEntityService.enable(id); - - this.evictRelaCache(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("停用") - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genDataEntityService.unable(id); - - this.evictRelaCache(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("获取生成代码配置") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping("/generate") - public InvokeResult getGenerate(@NotNull(message = "ID不能为空！") String id) { - - DataEntityGenerateDto data = genDataEntityService.getGenerateById(id); - - DataEntityGenerateBo result = new DataEntityGenerateBo(data); - - return InvokeResultBuilder.success(result); - } - - @ApiOperation("修改生成代码配置") - @PatchMapping("/generate") - public InvokeResult updateGenerate(@Valid @RequestBody UpdateDataEntityGenerateVo vo) { - - genDataEntityService.updateGenerate(vo); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("预览") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping("/preview") - public InvokeResult> preView(@NotNull(message = "ID不能为空！") String id) { - - Generator generator = Generator.getInstance(id); - List datas = generator.generateAll(); - Map result = new LinkedHashMap<>(); - for (GenerateDto data : datas) { - result.put(data.getFileName(), data.getContent()); - } - - return InvokeResultBuilder.success(result); - } - - @ApiOperation("下载") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping("/download") - public void download(@NotNull(message = "ID不能为空！") String id) { - - String fileLocation = location.endsWith(File.separator) ? location : location + File.separator; - String filePath = fileLocation + IdUtil.getUUID() + File.separator; - - Generator generator = Generator.getInstance(id); - - List datas = generator.generateAll(); - for (GenerateDto data : datas) { - - File file = FileUtil.file(filePath + data.getPath() + File.separator + data.getFileName()); - FileUtil.writeString(data.getContent(), file, StandardCharsets.UTF_8); - } - - File zipFile = ZipUtil.zip(filePath, fileLocation + IdUtil.getUUID() + ".zip", false); - - ResponseUtil.download(zipFile); - } - - @ApiOperation("同步数据表") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @PutMapping("/sync/table") - public InvokeResult syncTable(@NotNull(message = "ID不能为空！") String id) { - genDataEntityService.syncTable(id); - - this.evictRelaCache(id); - - return InvokeResultBuilder.success(); - } - - // 失效关联数据的缓存 - private void evictRelaCache(String entityId) { - ThreadUtil.execAsync(() -> { - GenDataObjService genDataObjService = ApplicationUtil.getBean(GenDataObjService.class); - List ids = genDataObjService.getRelaGenDataEntityIds(entityId); - if (CollectionUtil.isNotEmpty(ids)) { - genDataObjService.cleanCacheByKeys(ids); - } - - GenCustomListService genCustomListService = ApplicationUtil.getBean(GenCustomListService.class); - ids = genCustomListService.getRelaGenDataEntityIds(entityId); - if (CollectionUtil.isNotEmpty(ids)) { - genCustomListService.cleanCacheByKeys(ids); - } - }); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7b403f34eeb259128473fcb9b6e4cf6386c262e0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjCategoryController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.bo.data.obj.category.GetGenDataObjCategoryBo; -import com.lframework.xingyun.template.gen.bo.data.obj.category.QueryGenDataObjCategoryBo; -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.xingyun.template.gen.service.GenDataObjCategoryService; -import com.lframework.xingyun.template.gen.vo.data.obj.category.CreateGenDataObjCategoryVo; -import com.lframework.xingyun.template.gen.vo.data.obj.category.UpdateGenDataObjCategoryVo; -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 java.util.Arrays; -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.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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据对象分类 - * - * @author zmj - */ -@Api(tags = "数据对象分类") -@Validated -@RestController -@RequestMapping("/gen/data/obj/category") -public class GenDataObjCategoryController extends DefaultBaseController { - - @Autowired - private GenDataObjCategoryService genDataObjCategoryService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @GetMapping("/query") - public InvokeResult> query() { - List datas = genDataObjCategoryService.queryList(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryGenDataObjCategoryBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenDataObjCategory data = genDataObjCategoryService.findById(id); - if (data == null) { - throw new DefaultClientException("数据对象分类不存在！"); - } - - GetGenDataObjCategoryBo result = new GetGenDataObjCategoryBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增数据对象分类 - */ - @ApiOperation("新增数据对象分类") - @PostMapping - public InvokeResult create(@Valid CreateGenDataObjCategoryVo vo) { - - genDataObjCategoryService.create(vo); - - genDataObjCategoryService.cleanCacheByKey("all"); - - return InvokeResultBuilder.success(); - } - - /** - * 修改数据对象分类 - */ - @ApiOperation("修改数据对象分类") - @PutMapping - public InvokeResult update(@Valid UpdateGenDataObjCategoryVo vo) { - - genDataObjCategoryService.update(vo); - - genDataObjCategoryService.cleanCacheByKeys(Arrays.asList("all", vo.getId())); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("删除数据对象分类") - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genDataObjCategoryService.deleteById(id); - - genDataObjCategoryService.cleanCacheByKeys(Arrays.asList("all", id)); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1fd5d17901f07fe1b36c294713e4d59b5ecc87ef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java +++ /dev/null @@ -1,247 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.bo.data.obj.GenDataObjColumnBo; -import com.lframework.xingyun.template.gen.bo.data.obj.GenDataObjColumnBo.ColumnBo; -import com.lframework.xingyun.template.gen.bo.data.obj.GetGenDataObjBo; -import com.lframework.xingyun.template.gen.bo.data.obj.QueryGenDataObjBo; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjQueryDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import com.lframework.xingyun.template.gen.vo.data.obj.CreateGenDataObjVo; -import com.lframework.xingyun.template.gen.vo.data.obj.QueryGenDataObjVo; -import com.lframework.xingyun.template.gen.vo.data.obj.UpdateGenDataObjVo; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -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.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import lombok.extern.slf4j.Slf4j; -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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "数据对象") -@Slf4j -@Validated -@RestController -@RequestMapping("/gen/data/obj") -public class GenDataObjController extends DefaultBaseController { - - @Autowired - private GenDataObjService genDataObjService; - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Autowired - private GenDataObjQueryDetailService genDataObjQueryDetailService; - - @Autowired - private GenDataEntityService genDataEntityService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @ApiOperation("查询数据对象列表") - @GetMapping("/query") - public InvokeResult> query(@Valid QueryGenDataObjVo vo) { - - PageResult pageResult = genDataObjService.query(getPageIndex(vo), getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(QueryGenDataObjBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - @ApiOperation("查询数据对象列") - @ApiImplicitParam(value = "数据对象ID", name = "id", paramType = "query", required = true) - @GetMapping("/columns") - public InvokeResult> queryColumns( - @NotBlank(message = "ID不能为空！") String id) { - - GenDataObj dataObj = genDataObjService.findById(id); - if (dataObj == null) { - throw new DefaultClientException("数据对象不存在！"); - } - - List dataObjDetails = genDataObjDetailService.getByObjId(dataObj.getId()); - - List dataObjQueryDetails = genDataObjQueryDetailService.getByObjId( - dataObj.getId()); - - List results = new ArrayList<>(); - // 先查主表 - GenDataEntity dataEntity = genDataEntityService.findById(dataObj.getMainTableId()); - if (dataEntity == null) { - throw new DefaultClientException("主表已被删除，请检查！"); - } - - List dataEntityDetails = genDataEntityDetailService.getByEntityId( - dataEntity.getId()); - - GenDataObjColumnBo mainTable = new GenDataObjColumnBo(); - mainTable.setColumns(new ArrayList<>()); - mainTable.setId(dataEntity.getId()); - mainTable.setName("【主表】" + dataEntity.getName()); - for (GenDataEntityDetail dataEntityDetail : dataEntityDetails) { - ColumnBo column = new ColumnBo(); - column.setId(dataEntityDetail.getId()); - column.setRelaId(dataObj.getId()); - column.setName(dataEntityDetail.getName()); - column.setType(GenCustomListDetailType.MAIN_TABLE.getCode()); - column.setDataType(dataEntityDetail.getDataType().getCode()); - column.setViewType(dataEntityDetail.getViewType().getCode()); - mainTable.getColumns().add(column); - } - - results.add(mainTable); - - // 再查子表 - if (!CollectionUtil.isEmpty(dataObjDetails)) { - for (GenDataObjDetail dataObjDetail : dataObjDetails) { - GenDataEntity subDataEntity = genDataEntityService.findById(dataObjDetail.getSubTableId()); - if (subDataEntity == null) { - throw new DefaultClientException("子表已被删除，请检查！"); - } - - List subDataEntityDetails = genDataEntityDetailService.getByEntityId( - subDataEntity.getId()); - - GenDataObjColumnBo subTable = new GenDataObjColumnBo(); - subTable.setColumns(new ArrayList<>()); - subTable.setId(subDataEntity.getId()); - subTable.setName("【子表】" + subDataEntity.getName()); - for (GenDataEntityDetail dataEntityDetail : subDataEntityDetails) { - ColumnBo column = new ColumnBo(); - column.setId(dataEntityDetail.getId()); - column.setRelaId(dataObjDetail.getId()); - column.setName(dataEntityDetail.getName()); - column.setType(GenCustomListDetailType.SUB_TALBE.getCode()); - column.setDataType(dataEntityDetail.getDataType().getCode()); - column.setViewType(dataEntityDetail.getViewType().getCode()); - subTable.getColumns().add(column); - } - - results.add(subTable); - } - } - - // 最后查附加字段 - if (!CollectionUtil.isEmpty(dataObjQueryDetails)) { - GenDataObjColumnBo customQuery = new GenDataObjColumnBo(); - customQuery.setColumns(new ArrayList<>()); - customQuery.setId("customQuery"); - customQuery.setName("自定义查询"); - for (GenDataObjQueryDetail genDataObjDetail : dataObjQueryDetails) { - ColumnBo column = new ColumnBo(); - column.setId(genDataObjDetail.getId()); - column.setRelaId(genDataObjDetail.getId()); - column.setName(genDataObjDetail.getCustomName()); - column.setType(GenCustomListDetailType.CUSTOM.getCode()); - column.setDataType(genDataObjDetail.getDataType().getCode()); - customQuery.getColumns().add(column); - } - - results.add(customQuery); - } - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - GenDataObj data = genDataObjService.findById(id); - - return InvokeResultBuilder.success(new GetGenDataObjBo(data)); - } - - @ApiOperation("新增") - @PostMapping - public InvokeResult create(@RequestBody @Valid CreateGenDataObjVo vo) { - - genDataObjService.create(vo); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("修改") - @PutMapping - public InvokeResult update(@RequestBody @Valid UpdateGenDataObjVo vo) { - - genDataObjService.update(vo); - - genDataObjService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - genDataObjService.delete(id); - - genDataObjService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("启用") - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genDataObjService.enable(id); - - genDataObjService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("停用") - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - - genDataObjService.unable(id); - - genDataObjService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 68d7b7451e543f6a00d7f0b398f4d9f5a1317ffc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenSelectorController.java +++ /dev/null @@ -1,523 +0,0 @@ -package com.lframework.xingyun.template.gen.controller; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.StringUtil; -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.list.GenCustomListSelectorBo; -import com.lframework.xingyun.template.gen.bo.custom.list.category.GenCustomListCategorySelectorBo; -import com.lframework.xingyun.template.gen.bo.custom.page.GenCustomPageSelectorBo; -import com.lframework.xingyun.template.gen.bo.custom.page.category.GenCustomPageCategorySelectorBo; -import com.lframework.xingyun.template.gen.bo.custom.selector.GenCustomSelectorSelectorBo; -import com.lframework.xingyun.template.gen.bo.custom.selector.category.GenCustomSelectorCategorySelectorBo; -import com.lframework.xingyun.template.gen.bo.data.entity.GenDataEntityDetailSelectorBo; -import com.lframework.xingyun.template.gen.bo.data.entity.GenDataEntitySelectorBo; -import com.lframework.xingyun.template.gen.bo.data.entity.category.GenDataEntityCategorySelectorBo; -import com.lframework.xingyun.template.gen.bo.data.obj.GenDataObjSelectorBo; -import com.lframework.xingyun.template.gen.bo.data.obj.category.GenDataObjCategorySelectorBo; -import com.lframework.xingyun.template.gen.bo.simpledb.SimpleDBSelectorBo; -import com.lframework.xingyun.template.gen.dto.simpledb.SimpleDBDto; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.xingyun.template.gen.service.GenCustomListCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.service.GenCustomPageCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomPageService; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.service.GenDataEntityCategoryService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.service.GenDataObjCategoryService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import com.lframework.xingyun.template.gen.service.SimpleDBService; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.list.category.GenCustomListCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.page.GenCustomPageSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.GenCustomSelectorSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.GenCustomSelectorCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntityDetailSelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntitySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.category.GenDataEntityCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.GenDataObjSelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.category.GenDataObjCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.simpledb.SimpleTableSelectorVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import javax.validation.Valid; -import lombok.extern.slf4j.Slf4j; -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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "代码生成-选择器") -@Slf4j -@Validated -@RestController -@RequestMapping("/selector/gen") -public class GenSelectorController extends DefaultBaseController { - - @Autowired - private GenDataEntityCategoryService genDataEntityCategoryService; - - @Autowired - private GenDataObjCategoryService genDataObjCategoryService; - - @Autowired - private SimpleDBService simpleDBService; - - @Autowired - private GenDataEntityService genDataEntityService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Autowired - private GenDataObjService genDataObjService; - - @Autowired - private GenCustomListCategoryService genCustomListCategoryService; - - @Autowired - private GenCustomListService genCustomListService; - - @Autowired - private GenCustomSelectorCategoryService genCustomSelectorCategoryService; - - @Autowired - private GenCustomSelectorService genCustomSelectorService; - - @Autowired - private GenCustomPageCategoryService genCustomPageCategoryService; - - @Autowired - private GenCustomPageService genCustomPageService; - - @ApiOperation("数据实体分类") - @GetMapping("/data/entity/category") - public InvokeResult> dataEntityCategory( - @Valid GenDataEntityCategorySelectorVo vo) { - - PageResult pageResult = genDataEntityCategoryService.selector( - getPageIndex(vo), getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenDataEntityCategorySelectorBo::new) - .collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据实体分类 - */ - @ApiOperation("加载数据实体分类") - @PostMapping("/data/entity/category/load") - public InvokeResult> loadDataEntityCategory( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genDataEntityCategoryService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenDataEntityCategorySelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("数据对象分类") - @GetMapping("/data/obj/category") - public InvokeResult> dataObjCategory( - @Valid GenDataObjCategorySelectorVo vo) { - - PageResult pageResult = genDataObjCategoryService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenDataObjCategorySelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据对象分类 - */ - @ApiOperation("加载数据对象分类") - @PostMapping("/data/obj/category/load") - public InvokeResult> loadDataObjCategory( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genDataObjCategoryService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenDataObjCategorySelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("数据表") - @GetMapping("/table") - public InvokeResult> table(@Valid SimpleTableSelectorVo vo) { - PageResult pageResult = simpleDBService.selector(getPageIndex(vo), getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(SimpleDBSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据表 - */ - @ApiOperation("加载数据表") - @PostMapping("/table/load") - public InvokeResult> loadTable( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = simpleDBService.listByIds(ids); - List results = datas.stream().map(SimpleDBSelectorBo::new) - .collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("数据实体") - @GetMapping("/data/entity") - public InvokeResult> dataEntity( - @Valid GenDataEntitySelectorVo vo) { - PageResult pageResult = genDataEntityService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenDataEntitySelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据实体 - */ - @ApiOperation("加载数据实体") - @PostMapping("/data/entity/load") - public InvokeResult> loadDataEntity( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = genDataEntityService.listByIds(ids); - List results = datas.stream().map(GenDataEntitySelectorBo::new) - .collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("数据实体明细") - @GetMapping("/data/entity/detail") - public InvokeResult> dataEntityDetail( - @Valid GenDataEntityDetailSelectorVo vo) { - List datas = genDataEntityDetailService.selector(vo); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenDataEntityDetailSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("数据对象") - @GetMapping("/data/obj") - public InvokeResult> dataObj(@Valid GenDataObjSelectorVo vo) { - PageResult pageResult = genDataObjService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenDataObjSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据对象 - */ - @ApiOperation("加载数据对象") - @PostMapping("/data/obj/load") - public InvokeResult> loadDataObj( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genDataObjService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream().map(GenDataObjSelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("自定义列表分类") - @GetMapping("/custom/list/category") - public InvokeResult> customListCategory( - @Valid GenCustomListCategorySelectorVo vo) { - PageResult pageResult = genCustomListCategoryService.selector( - getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenCustomListCategorySelectorBo::new) - .collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载自定义列表分类 - */ - @ApiOperation("加载自定义列表分类") - @PostMapping("/custom/list/category/load") - public InvokeResult> loadCustomListCategory( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genCustomListCategoryService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenCustomListCategorySelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("自定义列表") - @GetMapping("/custom/list") - public InvokeResult> customList( - @Valid GenCustomListSelectorVo vo) { - PageResult pageResult = genCustomListService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenCustomListSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载自定义列表 - */ - @ApiOperation("加载自定义列表") - @PostMapping("/custom/list/load") - public InvokeResult> loadCustomList( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genCustomListService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenCustomListSelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("自定义选择器分类") - @GetMapping("/custom/selector/category") - public InvokeResult> customSelectorCategory( - @Valid GenCustomSelectorCategorySelectorVo vo) { - PageResult pageResult = genCustomSelectorCategoryService.selector( - getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenCustomSelectorCategorySelectorBo::new) - .collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载自定义选择器分类 - */ - @ApiOperation("加载自定义选择器分类") - @PostMapping("/custom/selector/category/load") - public InvokeResult> loadCustomSelectorCategory( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genCustomSelectorCategoryService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenCustomSelectorCategorySelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("自定义选择器") - @GetMapping("/custom/selector") - public InvokeResult> customList( - @Valid GenCustomSelectorSelectorVo vo) { - PageResult pageResult = genCustomSelectorService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenCustomSelectorSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载自定义选择器 - */ - @ApiOperation("加载自定义选择器") - @PostMapping("/custom/selector/load") - public InvokeResult> loadCustomSelector( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genCustomSelectorService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenCustomSelectorSelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("自定义页面分类") - @GetMapping("/custom/page/category") - public InvokeResult> customPageCategory() { - List datas = genCustomPageCategoryService.queryList(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenCustomPageCategorySelectorBo::new) - .collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 加载自定义表单分类 - */ - @ApiOperation("加载自定义页面分类") - @PostMapping("/custom/page/category/load") - public InvokeResult> loadCustomPageCategory( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> genCustomPageCategoryService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenCustomPageCategorySelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } - - @ApiOperation("自定义页面") - @GetMapping("/custom/page") - public InvokeResult> customPage( - @Valid GenCustomPageSelectorVo vo) { - PageResult pageResult = genCustomPageService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(GenCustomPageSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载自定义表单 - */ - @ApiOperation("加载自定义页面") - @PostMapping("/custom/page/load") - public InvokeResult> loadCustomPage( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(Objects::nonNull) - .map(t -> genCustomPageService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(GenCustomPageSelectorBo::new).collect( - Collectors.toList()); - return InvokeResultBuilder.success(results); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f5135596b6cca3bfe8b0c97caad0ee284d8264d3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenMysqlDataTypeConverter.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.template.gen.converters; - -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenMySqlDataType; -import org.springframework.stereotype.Component; - -@Component -public class GenMysqlDataTypeConverter { - - public GenMySqlDataType convert(GenDataType dataType) { - - GenMySqlDataType[] mySqlDataTypes = GenMySqlDataType.values(); - for (GenMySqlDataType mySqlDataType : mySqlDataTypes) { - if (mySqlDataType.getDataType() == dataType) { - return mySqlDataType; - } - } - - return null; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index efe88b899caa88d6b49ef3f6005937791083c760..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenStringConverter.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lframework.xingyun.template.gen.converters; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.enums.GenConvertType; - -/** - * @author zmj - * @since 2022/8/18 - */ -public class GenStringConverter { - - /** - * 转换 - * - * @param type - * @param oriStr - * @return - */ - public static String convert(GenConvertType type, String oriStr) { - if (StringUtil.isBlank(oriStr)) { - return oriStr; - } - - if (type == GenConvertType.UNDERLINE_TO_CAMEL) { - return StringUtil.toCamelCase(oriStr); - } - - return null; - } - - /** - * 强制转换成驼峰 - * - * @param type - * @param oriStr - * @return - */ - public static String convertToCamelCase(GenConvertType type, String oriStr) { - - if (type == GenConvertType.UNDERLINE_TO_CAMEL) { - return StringUtil.toCamelCase(oriStr); - } - - return null; - } - - /** - * 强制转换成普通小写 即为：不含分割线的小写字符 - * - * @param type - * @param oriStr - * @return - */ - public static String convertToNormalLowerCase(GenConvertType type, String oriStr) { - if (type == GenConvertType.UNDERLINE_TO_CAMEL) { - return StringUtil.toCamelCase(oriStr).toLowerCase(); - } - - return null; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3b1f4d5873d7586a2b5fd843130e1d4ad94e5975..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenViewTypeConverter.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.template.gen.converters; - -import com.lframework.starter.common.exceptions.impl.DefaultSysException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -public class GenViewTypeConverter { - - public boolean canConvert(GenViewType viewType, GenDataType dataType) { - - List viewTypes = convert(dataType); - if (CollectionUtil.isEmpty(viewTypes)) { - return false; - } - - return viewTypes.contains(viewType); - } - - public List convert(GenDataType dataType) { - - if (dataType == null) { - return null; - } - - List results = new ArrayList<>(); - if (dataType == GenDataType.STRING) { - results.addAll(Arrays.asList(GenViewType.values())); - } else if (dataType == GenDataType.INTEGER) { - results.addAll(Arrays.asList(GenViewType.INPUT, GenViewType.SELECT)); - } else if (dataType == GenDataType.SHORT) { - results.addAll(Arrays.asList(GenViewType.INPUT, GenViewType.SELECT)); - } else if (dataType == GenDataType.LONG) { - results.addAll(Arrays.asList(GenViewType.INPUT)); - } else if (dataType == GenDataType.DOUBLE) { - results.addAll(Arrays.asList(GenViewType.INPUT)); - } else if (dataType == GenDataType.LOCAL_DATE) { - results.addAll(Arrays.asList(GenViewType.INPUT, GenViewType.DATE, GenViewType.DATE_RANGE)); - } else if (dataType == GenDataType.LOCAL_DATE_TIME) { - results.addAll( - Arrays.asList(GenViewType.INPUT, GenViewType.DATETIME, GenViewType.DATE_RANGE)); - } else if (dataType == GenDataType.LOCAL_TIME) { - results.addAll(Arrays.asList(GenViewType.INPUT, GenViewType.TIME)); - } else if (dataType == GenDataType.BOOLEAN) { - results.addAll(Arrays.asList(GenViewType.INPUT, GenViewType.SELECT)); - } else if (dataType == GenDataType.BIG_DECIMAL) { - results.addAll(Arrays.asList(GenViewType.INPUT)); - } else { - log.error("未知的GenDataType={}", dataType); - throw new DefaultSysException("未知的GenDataType"); - } - - return results; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 78d30ca104bc1c89e548b2d41ce49fe08357bdb5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/directives/FormatDirective.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.lframework.xingyun.template.gen.directives; - -import com.lframework.starter.common.utils.CollectionUtil; -import freemarker.core.Environment; -import freemarker.template.TemplateDirectiveBody; -import freemarker.template.TemplateDirectiveModel; -import freemarker.template.TemplateException; -import freemarker.template.TemplateModel; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -public class FormatDirective implements TemplateDirectiveModel { - - public static final String DIRECTIVE_NAME = "format"; - - private static final char NEWLINE = '\n'; - - @Override - public void execute(Environment env, @SuppressWarnings("rawtypes") Map params, - TemplateModel[] loopVars, - TemplateDirectiveBody body) throws TemplateException, IOException { - - FormatWriter writer = new FormatWriter(env.getOut(), - env.getCurrentDirectiveCallPlace().getBeginColumn()); - body.render(writer); - - List chars = writer.getWriteChars(); - char[] space = writer.getSpace(); - - if (!CollectionUtil.isEmpty(chars)) { - List checkList = chars.subList(chars.size() - space.length, chars.size()); - if (checkList.stream().allMatch(t -> t == ' ')) { - chars = chars.subList(0, chars.size() - space.length); - } - - char[] newChars = new char[chars.size()]; - for (int i = 0; i < chars.size(); i++) { - newChars[i] = chars.get(i); - } - env.getOut().write(newChars); - } - } - - private static class FormatWriter extends Writer { - - private final Writer out; - - private final char[] space; - private final List writeChars = new ArrayList<>(); - private boolean newLine = true; - - public FormatWriter(Writer out, int column) { - - this.out = out; - this.space = new char[column]; - Arrays.fill(this.space, ' '); - } - - public char[] getSpace() { - - return space; - } - - public List getWriteChars() { - - return writeChars; - } - - @Override - public void write(char[] cbuf, int off, int len) throws IOException { - - List chars = new ArrayList<>(); - for (int i = off; i < len; i++) { - char c = cbuf[i]; - if (newLine) { - for (char s : space) { - chars.add(s); - } - newLine = false; - } - - if (c == NEWLINE) { - newLine = true; - } - - chars.add(c); - - if (newLine) { - for (char s : space) { - chars.add(s); - } - newLine = false; - } - } - - writeChars.addAll(chars); - } - - @Override - public void flush() throws IOException { - - out.flush(); - } - - @Override - public void close() throws IOException { - - out.close(); - } - - } - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 546c17b4d47a671332ccf8bc79b244df02659f6a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/DataEntityGenerateDto.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.data.entity; - -import com.lframework.xingyun.template.gen.dto.gen.GenCreateColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenDetailColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import com.lframework.xingyun.template.gen.dto.gen.GenQueryColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenQueryParamsColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenUpdateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import java.util.List; -import lombok.Data; - -@Data -public class DataEntityGenerateDto implements BaseDto, Serializable { - - /** - * 字段信息 - */ - private List columns; - - /** - * 基本设置 - */ - private GenGenerateInfoDto generateInfo; - - /** - * 新增配置 - */ - private List createConfigs; - - /** - * 修改配置 - */ - private List updateConfigs; - - /** - * 查询配置 - */ - private List queryConfigs; - - /** - * 查询参数配置 - */ - private List queryParamsConfigs; - - /** - * 详情配置 - */ - private List detailConfigs; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 76b22a50431510ffc652a3401dbd5397164f7411..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/GenDataEntityDetailDto.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.data.entity; - -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenOrderType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenDataEntityDetailDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 字段显示名称 - */ - private String name; - - /** - * 字段名称 - */ - private String columnName; - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 数据类型 - */ - private GenDataType dataType; - - /** - * 排序编号 - */ - private Integer columnOrder; - - /** - * 备注 - */ - private String description; - - /** - * 显示类型 - */ - private GenViewType viewType; - - /** - * 是否内置枚举 - */ - private Boolean fixEnum = Boolean.FALSE; - - /** - * 后端枚举名 - */ - private String enumBack; - - /** - * 前端枚举名 - */ - private String enumFront; - - /** - * 正则表达式 - */ - private String regularExpression; - - /** - * 是否排序字段 - */ - private Boolean isOrder = Boolean.FALSE; - - /** - * 排序类型 - */ - private GenOrderType orderType; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 661e151615503c8f04476aa0ea9771441e68e5c0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenCreateColumnConfigDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.gen; - -import com.lframework.xingyun.template.gen.components.CreateColumnConfig; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenCreateColumnConfigDto implements BaseDto, CreateColumnConfig, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 是否必填 - */ - private Boolean required; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 28681ab5e378e7e5ca70785d79ba32e133116fd6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenDetailColumnConfigDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.gen; - -import com.lframework.xingyun.template.gen.components.DetailColumnConfig; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenDetailColumnConfigDto implements BaseDto, DetailColumnConfig, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 列宽 - */ - private Integer span; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a513c7aaea678f4dc53942f2c68300781e59d2e7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenGenerateInfoDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.gen; - -import com.lframework.xingyun.template.gen.enums.GenKeyType; -import com.lframework.xingyun.template.gen.enums.GenTemplateType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenGenerateInfoDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 生成模板类型 - */ - private GenTemplateType templateType; - - /** - * 包名 - */ - private String packageName; - - /** - * 模块名 - */ - private String moduleName; - - /** - * 业务名 - */ - private String bizName; - - /** - * 类名 - */ - private String className; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 父级菜单ID - */ - private String parentMenuId; - - /** - * 主键类型 - */ - private GenKeyType keyType; - - /** - * 作者 - */ - private String author; - - /** - * 本级菜单编号 - */ - private String menuCode; - - /** - * 本级菜单名称 - */ - private String menuName; - - /** - * 详情页Span总数量 - */ - private Integer detailSpan; - - /** - * 是否应用缓存 - */ - private Boolean isCache; - - /** - * 是否内置删除功能 - */ - private Boolean hasDelete; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5378571e1e67daf7dc90c03491eb9df9b3564782..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryColumnConfigDto.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.gen; - -import com.lframework.xingyun.template.gen.components.QueryColumnConfig; -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenQueryColumnConfigDto implements BaseDto, QueryColumnConfig, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 宽度类型 - */ - private GenQueryWidthType widthType; - - /** - * 宽度 - */ - private Integer width; - - /** - * 是否页面排序 - */ - private Boolean sortable; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5bc65e302dd3cef6f8fcffd1730a159309f19030..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryParamsColumnConfigDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.gen; - -import com.lframework.xingyun.template.gen.components.QueryParamsColumnConfig; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenQueryParamsColumnConfigDto implements BaseDto, QueryParamsColumnConfig, - Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 查询类型 - */ - private GenQueryType queryType; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 68abfa20cdc13f98eda67c0934739e9e76f4b8fe..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenUpdateColumnConfigDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.gen; - -import com.lframework.xingyun.template.gen.components.UpdateColumnConfig; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenUpdateColumnConfigDto implements BaseDto, UpdateColumnConfig, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 是否必填 - */ - private Boolean required; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index be7b3c400d51b0d8f43728dee7dc9db2d1f37c77..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/generate/GenerateDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.generate; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class GenerateDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 文件路径 - */ - private String path; - - /** - * 文件名 - */ - private String fileName; - - /** - * 文件内容 - */ - private String content; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index aded388c80323c5d9db32df4f0f54c2c47cf367c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableColumnDto.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.simpledb; - -import com.lframework.xingyun.template.gen.enums.GenMySqlDataType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class OriSimpleTableColumnDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 表ID - */ - private String tableId; - - /** - * 字段名 - */ - private String columnName; - - /** - * 字段数据类型 - */ - private GenMySqlDataType dataType; - - /** - * 是否允许为空 - */ - private Boolean isNullable; - - /** - * 列主键类型 - */ - private Boolean isKey; - - /** - * 默认值 - */ - private String columnDefault; - - /** - * 字段排序 - */ - private Integer ordinalPosition; - - /** - * 字段类型 - */ - private String columnType; - - /** - * 字段备注 - */ - private String columnComment; - - /** - * 长度 - */ - private Long len; - - /** - * 小数位数 - */ - private Integer decimals; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d3ad6d31452b2546e551a7843a7adb84f2a0b592..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableDto.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.simpledb; - -import com.lframework.xingyun.template.gen.components.Table; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import java.util.List; -import lombok.Data; - -@Data -public class OriSimpleTableDto implements BaseDto, Table, Serializable { - - private static final long serialVersionUID = 1L; - - private String id; - - /** - * 数据表所属的数据库名 - */ - private String tableSchema; - - /** - * 数据库表名 - */ - private String tableName; - - /** - * 字段信息 - */ - private List columns; - - /** - * 数据库引擎 - */ - private String engine; - - /** - * 字符校验编码集 - */ - private String tableCollation; - - /** - * 备注 - */ - private String tableComment; - - /** - * 转换方式 - */ - private GenConvertType convertType; - - @Override - public String getSchema() { - - return this.tableSchema; - } - - @Override - public String getComment() { - - return this.tableComment; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6f273870e76ac1aba33caf6a33d3e87ea6fb9c6a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleDBDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.simpledb; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SimpleDBDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 库名 - */ - private String tableSchema; - - /** - * 表名 - */ - private String tableName; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0f1015e4fde62207709cea53132519b6300763e4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleTableDto.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lframework.xingyun.template.gen.dto.simpledb; - -import com.lframework.xingyun.template.gen.components.Table; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import java.util.List; -import lombok.Data; - -@Data -public class SimpleTableDto implements BaseDto, Table, Serializable { - - private static final long serialVersionUID = 1L; - - private String id; - - /** - * 数据表所属的数据库名 - */ - private String tableSchema; - - /** - * 数据库表名 - */ - private String tableName; - - /** - * 字段信息 - */ - private List columns; - - /** - * 数据库引擎 - */ - private String engine; - - /** - * 字符校验编码集 - */ - private String tableCollation; - - /** - * 备注 - */ - private String tableComment; - - /** - * 转换方式 - */ - private GenConvertType convertType; - - @Override - public String getSchema() { - - return this.tableSchema; - } - - @Override - public String getComment() { - - return this.tableComment; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 705b6c64cd74359fbc48837f2fc50b27b570a7be..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCreateColumnConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_create_column_config") -public class GenCreateColumnConfig extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 是否必填 - */ - private Boolean required; - - /** - * 排序编号 - */ - private Integer orderNo; - - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 882e3fc2910068807dd7e5e6e4699346236775b5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomList.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenCustomListType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 自定义列表 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_custom_list") -public class GenCustomList extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "GenCustomList"; - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 分类ID - */ - private String categoryId; - - /** - * 数据对象ID - */ - private String dataObjId; - - /** - * 列表类型 - */ - private GenCustomListType listType; - - /** - * 表单Label宽度 - */ - private Integer labelWidth; - - /** - * 是否分页 - */ - private Boolean hasPage; - - /** - * 是否树形列表 - */ - private Boolean treeData; - - /** - * ID字段 - */ - private String idColumn; - - /** - * ID字段关联ID - */ - private String idColumnRelaId; - - /** - * 父级ID字段 - */ - private String treePidColumn; - - /** - * 父级ID字段关联ID - */ - private String treePidColumnRelaId; - - /** - * 树形节点字段 - */ - private String treeNodeColumn; - - /** - * 树形节点字段关联ID - */ - private String treeNodeColumnRelaId; - - /** - * 子节点Key值 - */ - private String treeChildrenKey; - - /** - * 是否允许导出 - */ - private Boolean allowExport; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 查询前置SQL - */ - private String queryPrefixSql; - - /** - * 查询后置SQL - */ - private String querySuffixSql; - - /** - * 后置SQL - */ - private String suffixSql; - - /** - * 创建人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-sys/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 deleted file mode 100644 index a2a7bff3f51c904be5bfd3e4795c21b5b070ca5f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListCategory.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 自定义列表分类 - *

- * - * @author zmj - */ -@Data -@TableName("gen_custom_list_category") -public class GenCustomListCategory extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomListCategory"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 0c69d96b1b0dcd951cf45c684dcf0abe3c9145f3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListDetail.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.starter.web.entity.BaseEntity; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_custom_list_detail") -public class GenCustomListDetail extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 自定义列表ID - */ - private String customListId; - - /** - * 关联ID 当type为主表时，此值为数据对象ID 当type为子表时，此值为数据对象明细ID 当type为自定义查询时，此值为GenDataObjQueryDetail的ID - */ - private String relaId; - - /** - * 数据实体ID - */ - private String dataEntityId; - - /** - * 宽度类型 - */ - private GenQueryWidthType widthType; - - /** - * 宽度 - */ - private Integer width; - - /** - * 是否页面排序 - */ - private Boolean sortable; - - /** - * 排序编号 - */ - private Integer orderNo; - - /** - * 类型 - */ - private GenCustomListDetailType type; - - /** - * 格式化脚本 - */ - private String formatter; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 89c806f1fae9590d61570b363e096eaa46996f90..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListHandleColumn.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnType; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnViewType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * 自定义列表操作列 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_custom_list_handle_column") -public class GenCustomListHandleColumn extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomListHandleColumn"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 自定义列表ID - */ - private String customListId; - - /** - * 显示名称 - */ - private String name; - - /** - * 显示类型 - */ - private GenCustomListBtnViewType viewType; - - /** - * 按钮类型 - */ - private GenCustomListBtnType btnType; - - /** - * 按钮配置 - */ - private String btnConfig; - - /** - * 图标 - */ - private String icon; - - /** - * 请求参数 - */ - private String requestParam; - - /** - * 宽度 - */ - private Integer width; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8bc96c6a520f8f9694b979e915b5767ddf71021a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListQueryParams.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.starter.web.entity.BaseEntity; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_custom_list_query_params") -public class GenCustomListQueryParams extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 自定义列表ID - */ - private String customListId; - - /** - * 关联ID 当type为主表时，此值为数据对象ID 当type为子表时，此值为数据对象明细ID - */ - private String relaId; - - /** - * 数据实体ID - */ - private String dataEntityId; - - /** - * 前端显示 - */ - private Boolean frontShow; - - /** - * 查询类型 - */ - private GenQueryType queryType; - - /** - * 表单宽度 - */ - private Integer formWidth; - - /** - * 默认值 - */ - private String defaultValue; - - /** - * 排序编号 - */ - private Integer orderNo; - - /** - * 类型 - */ - private GenCustomListDetailType type; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 78b406d9700e6b8110a96824c443445bd3d734c3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListToolbar.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnType; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnViewType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * 自定义列表工具栏 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_custom_list_toolbar") -public class GenCustomListToolbar extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomListToolbar"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 自定义列表ID - */ - private String customListId; - - /** - * 显示名称 - */ - private String name; - - /** - * 显示类型 - */ - private GenCustomListBtnViewType viewType; - - /** - * 按钮类型 - */ - private GenCustomListBtnType btnType; - - /** - * 按钮配置 - */ - private String btnConfig; - - /** - * 图标 - */ - private String icon; - - /** - * 请求参数 - */ - private String requestParam; - - /** - * 排序编号 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ed50a3fa9b15f4c601b95316ca662e8cf3adb23c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPage.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 自定义页面 - *

- * - * @author zmj - * @since 2023-06-20 - */ -@Data -@TableName("gen_custom_page") -public class GenCustomPage extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomPage"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @TableId(type = IdType.AUTO) - private Integer id; - - /** - * 名称 - */ - private String name; - - /** - * 分类ID - */ - private String categoryId; - - /** - * 页面代码 - */ - private String pageCode; - - /** - * 脚本代码 - */ - private String scriptCode; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/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 deleted file mode 100644 index f3c35bb95648817e9c636d976a8cbf9dc2c857fb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPageCategory.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 自定义页面分类 - *

- * - * @author zmj - */ -@Data -@TableName("gen_custom_page_category") -public class GenCustomPageCategory extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomPageCategory"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 父级ID - */ - private String parentId; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 35b2976d1745f85d1097850a82bea6a44575c6f6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelector.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 自定义选择器 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_custom_selector") -public class GenCustomSelector extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomSelector"; - - private static final long serialVersionUID = 1L; - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 分类ID - */ - private String categoryId; - - /** - * 自定义列表ID - */ - private String customListId; - - /** - * 对话框标题 - */ - private String dialogTittle; - - /** - * 对话框宽度 - */ - private String dialogWidth; - - /** - * 占位符 - */ - private String placeholder; - - /** - * ID字段 - */ - private String idColumn; - - /** - * ID字段关联ID - */ - private String idColumnRelaId; - - /** - * 名称字段 - */ - private String nameColumn; - - /** - * 名称字段关联ID - */ - private String nameColumnRelaId; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/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 deleted file mode 100644 index c29f3d47929ba65d4018871611a7cf29b953c8b8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelectorCategory.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 自定义选择器分类 - *

- * - * @author zmj - */ -@Data -@TableName("gen_custom_selector_category") -public class GenCustomSelectorCategory extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenCustomSelectorCategory"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 702989edf31acd80f03351d82f8898dcde652869..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntity.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.components.Table; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.xingyun.template.gen.enums.GenStatus; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据实体 - *

- * - * @author zmj - * @since 2022-09-17 - */ -@Data -@TableName("gen_data_entity") -public class GenDataEntity extends BaseEntity implements BaseDto, Table { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "GenDataEntity"; - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 分类ID - */ - private String categoryId; - - /** - * 生成状态 - */ - private GenStatus genStatus; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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; - - /** - * 数据表所属的数据库名 - */ - private String tableSchema; - - /** - * 数据库表名 - */ - private String tableName; - - /** - * 数据库引擎 - */ - private String engine; - - /** - * 字符校验编码集 - */ - private String tableCollation; - - /** - * 备注 - */ - private String tableComment; - - /** - * 转换方式 - */ - private GenConvertType convertType; - - @Override - public String getSchema() { - return this.tableSchema; - } - - @Override - public String getComment() { - return this.tableComment; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bce1d58a1e0a4bf05c682ebc4a99226d585d1e32..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityCategory.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据实体分类 - *

- * - * @author zmj - */ -@Data -@TableName("gen_data_entity_category") -public class GenDataEntityCategory extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenDataEntityCategory"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 2276e03e44ab03bb3ed120d7b6ed353e28bc161f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityDetail.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.components.TableColumn; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenOrderType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * 数据实体明细 - *

- * - * @author zmj - * @since 2022-09-17 - */ -@Data -@TableName("gen_data_entity_detail") -public class GenDataEntityDetail extends BaseEntity implements BaseDto, TableColumn { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 数据对象ID - */ - private String entityId; - - /** - * 字段显示名称 - */ - private String name; - - /** - * 字段名称 - */ - private String columnName; - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 数据类型 - */ - private GenDataType dataType; - - /** - * 排序编号 - */ - private Integer columnOrder; - - /** - * 备注 - */ - private String description; - - /** - * 显示类型 - */ - private GenViewType viewType; - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 后端枚举名 - */ - private String enumBack; - - /** - * 前端枚举名 - */ - private String enumFront; - - /** - * 正则表达式 - */ - private String regularExpression; - - /** - * 是否排序字段 - */ - private Boolean isOrder; - - /** - * 排序类型 - */ - private GenOrderType orderType; - - /** - * 数据字典ID - */ - private String dataDicId; - - /** - * 自定义选择器ID - */ - private String customSelectorId; - - /** - * 长度 - */ - private Long len; - - /** - * 小数位数 - */ - private Integer decimals; - - /** - * 字段名称 - */ - private String dbColumnName; - - /** - * 字段数据类型 - */ - private GenDataType dbDataType; - - /** - * 是否允许为空 - */ - private Boolean isNullable; - - /** - * 默认值 - */ - private String columnDefault; - - /** - * 字段排序 - */ - private Integer ordinalPosition; - - /** - * 字段备注 - */ - private String columnComment; - - /** - * 长度 - */ - private Long dbLen; - - /** - * 小数位数 - */ - private Integer dbDecimals; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1655d884ddfcec905f7dcd634c77105696635868..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObj.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据对象 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_data_obj") -public class GenDataObj extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "GenDataObj"; - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 分类ID - */ - private String categoryId; - - /** - * 主表ID - */ - private String mainTableId; - - /** - * 主表别名 - */ - private String mainTableAlias; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 8efe8842a4d97a3455c23ea3d449c2db80bfd0b0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjCategory.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.lframework.xingyun.template.gen.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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据对象分类 - *

- * - * @author zmj - */ -@Data -@TableName("gen_data_obj_category") -public class GenDataObjCategory extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "GenDataObjCategory"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 4110ee15f6b638e5a1adf32e51f426cc0cf6676f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjDetail.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenRelaMode; -import com.lframework.xingyun.template.gen.enums.GenRelaType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * 数据对象明细 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_data_obj_detail") -public class GenDataObjDetail extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "GenDataObjDetail"; - - /** - * ID - */ - private String id; - - /** - * 数据对象ID - */ - private String dataObjId; - - /** - * 主表字段 - */ - private String mainTableDetailIds; - - /** - * 关联类型 - */ - private GenRelaType relaType; - - /** - * 关联方式 - */ - private GenRelaMode relaMode; - - /** - * 子表ID - */ - private String subTableId; - - /** - * 子表别名 - */ - private String subTableAlias; - - /** - * 主表字段 - */ - private String subTableDetailIds; - - /** - * 排序 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0e4e46bb49df95176dd76e0b617f6f0fdeb644ce..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjQueryDetail.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * 数据对象自定义查询明细 - *

- * - * @author zmj - * @since 2022-09-24 - */ -@Data -@TableName("gen_data_obj_query_detail") -public class GenDataObjQueryDetail extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "GenDataObjQueryDetail"; - - /** - * ID - */ - private String id; - - /** - * 数据对象ID - */ - private String dataObjId; - - /** - * 显示名称 - */ - private String customName; - - /** - * 自定义SQL - */ - private String customSql; - - /** - * 别名 - */ - private String customAlias; - - /** - * 数据类型 - */ - private GenDataType dataType; - - /** - * 排序 - */ - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 260a8a9f8801522d420c662b5faee3d2bdeae12e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDetailColumnConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_detail_column_config") -public class GenDetailColumnConfig extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 列宽 - */ - private Integer span; - - /** - * 排序编号 - */ - private Integer orderNo; - - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c9ec41c102ebec38c9fecbcaeaab2db32cec5596..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenGenerateInfo.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenKeyType; -import com.lframework.xingyun.template.gen.enums.GenTemplateType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-08 - */ -@Data -@TableName("gen_generate_info") -public class GenGenerateInfo extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 生成模板类型 - */ - private GenTemplateType templateType; - - /** - * 包名 - */ - private String packageName; - - /** - * 模块名 - */ - private String moduleName; - - /** - * 业务名 - */ - private String bizName; - - /** - * 类名 - */ - private String className; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 父级菜单ID - */ - private String parentMenuId; - - /** - * 主键类型 - */ - private GenKeyType keyType; - - /** - * 作者 - */ - private String author; - - /** - * 本级菜单编号 - */ - private String menuCode; - - /** - * 本级菜单名称 - */ - private String menuName; - - /** - * 详情页Span总数量 - */ - private Integer detailSpan; - - /** - * 是否应用缓存 - */ - private Boolean isCache; - - /** - * 是否内置删除功能 - */ - private Boolean hasDelete; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1395f7cfd14b2842bc3e8b9105f2af8f06861046..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryColumnConfig.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_query_column_config") -public class GenQueryColumnConfig extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 宽度类型 - */ - private GenQueryWidthType widthType; - - /** - * 宽度 - */ - private Integer width; - - /** - * 是否页面排序 - */ - private Boolean sortable; - - /** - * 排序编号 - */ - private Integer orderNo; - - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index eb9cc76c6caa16871250ba6367c19b1f92ca9e22..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryParamsColumnConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_query_params_column_config") -public class GenQueryParamsColumnConfig extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 查询类型 - */ - private GenQueryType queryType; - - /** - * 排序编号 - */ - private Integer orderNo; - - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f278819c489bb7294765a9616d8b3050f539b890..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTable.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-05-28 - */ -@Data -@TableName("gen_simple_table") -public class GenSimpleTable extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - private String id; - - /** - * 数据表所属的数据库名 - */ - private String tableSchema; - - /** - * 数据库表名 - */ - private String tableName; - - /** - * 数据库引擎 - */ - private String engine; - - /** - * 字符校验编码集 - */ - private String tableCollation; - - /** - * 备注 - */ - private String tableComment; - - /** - * 转换方式 - */ - private GenConvertType convertType; - - /** - * 创建时间 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 65731b43a9aeede039695b98f69376c73f84b774..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTableColumn.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.xingyun.template.gen.components.TableColumn; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-05-28 - */ -@Data -@TableName("gen_simple_table_column") -public class GenSimpleTableColumn extends BaseEntity implements BaseDto, TableColumn { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 表ID - */ - private String tableId; - - /** - * 字段名 - */ - private String columnName; - - /** - * 字段数据类型 - */ - private GenDataType dataType; - - /** - * 是否允许为空 - */ - private Boolean isNullable; - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 默认值 - */ - private String columnDefault; - - /** - * 字段排序 - */ - private Integer ordinalPosition; - - /** - * 字段备注 - */ - private String columnComment; - - /** - * 长度 - */ - private Long len; - - /** - * 小数位数 - */ - private Integer decimals; - - @Override - public String getDbColumnName() { - return this.columnName; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e9a3d6f68bde18a2a4aaa1d5ea26eb0b845a344a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenUpdateColumnConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-12-10 - */ -@Data -@TableName("gen_update_column_config") -public class GenUpdateColumnConfig extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 是否必填 - */ - private Boolean required; - - /** - * 排序编号 - */ - private Integer orderNo; - - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0f808f32c01306f916b1fa2e7db95f81764f7959..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateColumnConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -public class GenerateColumnConfig { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bc7338943f9d7ea03595b01ab5b09a5f050586d3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lframework.xingyun.template.gen.entity; - -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.dto.BaseDto; -import lombok.Data; - -/** - * 代码生成信息 - */ -@Data -public class GenerateConfig extends BaseEntity implements BaseDto { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c14385cebc2e595a96193019ffc252cc1ab7ae71..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenConvertType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenConvertType implements BaseEnum { - UNDERLINE_TO_CAMEL(1, "下划线转驼峰"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenConvertType(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-sys/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 deleted file mode 100644 index d9de35d1aca2f0ada3cdd20bd0099ac995cdc228..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenCustomListBtnType implements BaseEnum { - - EXTERNAL(0, "外部链接"), - ROUTE(1, "路由跳转"), - EXCUTE_SCRIPT(3, "自定义表单"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenCustomListBtnType(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-sys/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 deleted file mode 100644 index 6bc8a84804a40a6f6ff708123841f37e993716dc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnViewType.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenCustomListBtnViewType implements BaseEnum { - - PRIMARY("primary", "primary"), - DEFAULT("default", "default"), - DASHED("dashed", "dashed"), - DANGER("danger", "danger"), - LINK("link", "link"), - LINK_DANGER("link-danger", "link-danger"); - - @EnumValue - private final String code; - - private final String desc; - - GenCustomListBtnViewType(String code, String desc) { - - this.code = code; - this.desc = desc; - } - - @Override - public String getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7fc4a6c7ab5a18168ca7a53594fc1a7977e05806..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListDetailType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenCustomListDetailType implements BaseEnum { - MAIN_TABLE(1, "主表"), - SUB_TALBE(2, "子表"), - CUSTOM(3, "自定义查询"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenCustomListDetailType(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-sys/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 deleted file mode 100644 index d1962e68b5196b3fc6c55d26dc9d446a931f2261..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenCustomListType implements BaseEnum { - SEQ(0, "序列"), - SINGLE(1, "单选"), - MULTIPLE(2, "多选"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenCustomListType(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-sys/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 deleted file mode 100644 index ec3fa812a47fcc53ee97fa3b63980bd78836c7bc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; - -public enum GenDataType implements BaseEnum { - - 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 - private final Integer code; - - private final Class clazz; - - private final 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; - } - - /** - * 是否是数字类型 - * - * @param type - * @return - */ - public static Boolean isNumberType(GenDataType type) { - - if (type == null) { - return false; - } - - return type == INTEGER || type == SHORT || type == LONG || type == DOUBLE - || type == BIG_DECIMAL; - } - - /** - * 是否是小数类型 - * - * @param type - * @return - */ - public static Boolean isDecimalType(GenDataType type) { - if (type == null) { - return false; - } - - return type == DOUBLE || type == BIG_DECIMAL; - } - - @Override - public Integer getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } - - public Class getClazz() { - return clazz; - } - - public String getFrontDesc() { - return frontDesc; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 68c8de44f9ec3bba2d1c7ad0536faad69451c799..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenKeyType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenKeyType implements BaseEnum { - AUTO(0, "自增ID"), UUID(1, "UUID"), SNOW_FLAKE(2, "雪花算法ID"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenKeyType(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-sys/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 deleted file mode 100644 index da1e85cdca1e84c5c72c8545f8669c7d200ab8c0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenMySqlDataType.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -/** - * MySql列类型枚举 dataType为null时表示该类型暂不支持 - */ -public enum GenMySqlDataType implements BaseEnum { - TINYINT("tinyint", GenDataType.INTEGER, "tinyint"), SMALLINT("smallint", GenDataType.INTEGER, - "smallint"), MEDIUMINT("mediumint", GenDataType.INTEGER, "mediumint"), INT("int", - GenDataType.INTEGER, - "int"), INTEGER("integer", GenDataType.INTEGER, "integer"), BIGINT("bigint", GenDataType.LONG, - "bigint"), BIT("bit", GenDataType.BOOLEAN, "bit"), REAL("real", GenDataType.DOUBLE, - "real"), DOUBLE( - "double", GenDataType.BIG_DECIMAL, "double"), FLOAT("float", GenDataType.BIG_DECIMAL, - "float"), DECIMAL( - "decimal", GenDataType.BIG_DECIMAL, "decimal"), NUMERIC("numeric", GenDataType.BIG_DECIMAL, - "numeric"), CHAR("char", GenDataType.STRING, "char"), VARCHAR("varchar", GenDataType.STRING, - "varchar"), DATE("date", GenDataType.LOCAL_DATE, "date"), TIME("time", GenDataType.LOCAL_TIME, - "time"), YEAR("year", null, "year"), TIMESTAMP("timestamp", GenDataType.LOCAL_DATE_TIME, - "timestamp"), DATETIME("datetime", GenDataType.LOCAL_DATE_TIME, "datetime"), TINYBLOB( - "tinyblob", null, - "tinyblob"), BLOB("blob", null, "blob"), MEDIUMBLOB("mediumblob", null, - "mediumblob"), LONGBLOB("longblob", - null, "longblob"), TINYTEXT("tinytext", GenDataType.STRING, "tinytext"), MEDIUMTEXT( - "mediumtext", - GenDataType.STRING, "mediumtext"), TEXT("text", GenDataType.STRING, "text"), LONGTEXT( - "longtext", - GenDataType.STRING, "longtext"), ENUM("enum", GenDataType.STRING, "enum"), SET("set", - GenDataType.STRING, - "set"), BINARY("binary", null, "binary"), VARBINARY("varbinary", null, "varbinary"), POINT( - "point", null, - "point"), LINESTRING("linestring", null, "linestring"), POLYGON("polygon", null, - "polygon"), GEOMETRY( - "geometry", null, "geometry"), MULTIPOINT("multipoint", null, "multipoint"), MULTILINESTRING( - "multilinestring", null, "multilinestring"), MULTIPOLYGON("multipolygon", null, - "multipolygon"), GEOMETRYCOLLECTION("geometrycollection", null, "geometrycollection"), JSON( - "json", null, - "json"); - - @EnumValue - private final String code; - - private final GenDataType dataType; - - private final String desc; - - GenMySqlDataType(String code, GenDataType dataType, String desc) { - - this.code = code; - this.dataType = dataType; - this.desc = desc; - } - - @Override - public String getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } - - public GenDataType getDataType() { - - return dataType; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e49afe27724e154a047297e116aa73f5f583e9fa..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenOrderType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenOrderType implements BaseEnum { - ASC("ASC", "升序"), DESC("DESC", "降序"); - - @EnumValue - private final String code; - - private final String desc; - - GenOrderType(String code, String desc) { - - this.code = code; - this.desc = desc; - } - - @Override - public String getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 893ba4daf9b7bb09f672cacfbc534630f56471e7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryType.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenQueryType implements BaseEnum { - EQ(0, "=", "="), GT(1, ">", ">"), GE(2, ">=", ">="), LT(3, "<", "<"), LE(4, "<=", "<="), NE(5, "!=", "!="), IN(6, "IN", "IN"), NOT_IN(7, - "NOT IN", "NOT IN"), LEFT_LIKE(8, "LIKE", "LIKE %?"), RIGHT_LIKE(9, "LIKE", "LIKE ?%"), AROUND_LIKE(10, "LIKE", "LIKE %?%"); - - @EnumValue - private final Integer code; - - private final String operation; - - private final String desc; - - GenQueryType(Integer code, String operation, String desc) { - - this.code = code; - this.operation = operation; - this.desc = desc; - } - - @Override - public Integer getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } - - public String getOperation() { - return operation; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 78d86a57eec343fdef3c3aff890328cf56fa8c3d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryWidthType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenQueryWidthType implements BaseEnum { - FIX(0, "固定宽度"), MIN(1, "最小宽度"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenQueryWidthType(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-sys/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 deleted file mode 100644 index 9b5374e3923a679f3756132bf7d22931bcc701df..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaMode.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenRelaMode implements BaseEnum { - LEFT_JOIN(0, "LEFT", "左连接"), - RIGHT_JOIN(1, "RIGHT", "右连接"), - INNER_JOIN(2, "INNER", "全连接"); - - @EnumValue - private final Integer code; - - private final String sql; - - private final String desc; - - GenRelaMode(Integer code, String sql, String desc) { - this.code = code; - this.sql = sql; - this.desc = desc; - } - - @Override - public Integer getCode() { - return this.code; - } - - @Override - public String getDesc() { - return this.desc; - } - - public String getSql() { - return sql; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2ab7a79d9b210a0ca67738aa2203154a4d8245c4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaType.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenRelaType implements BaseEnum { - ONE_RELA_ONE(0, "一对一"), - ONE_RELA_MANY(1, "一对多"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenRelaType(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-sys/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 deleted file mode 100644 index a5cad8687495fcb33073cf5203246c08b54c4319..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenStatus.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenStatus implements BaseEnum { - CREATED(0, "已生成"), SET_TABLE(1, "已设置数据表"), SET_GEN(2, "已设置生成配置"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenStatus(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-sys/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 deleted file mode 100644 index bf0584d4092259bde3322f184026f29eea4bf3c0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenTemplateType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenTemplateType implements BaseEnum { - LIST(1, "列表"), TREE(2, "树形表"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenTemplateType(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-sys/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 deleted file mode 100644 index 3798efd03d964a259243d4ddae9ae7e7d0ff5f12..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenType implements BaseEnum { - SIMPLE_DB(1, "数据库单表"); - - @EnumValue - private final Integer code; - - private final String desc; - - GenType(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-sys/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 deleted file mode 100644 index a9fdefc3d9a641aa56af3e60d583504d1d26f083..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenViewType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum GenViewType implements BaseEnum { - INPUT(0, "输入框"), TEXTATREA(1, "文本域"), DATETIME(2, "日期时间选择器"), DATE(3, "日期选择器"), TIME(4, - "时间选择器"), SELECT(5, - "选择器"), DATE_RANGE(6, "日期范围选择器"), DATA_DIC(7, "数据字典"), CUSTOM_SELECTOR(8, "自定义选择器"); - - @EnumValue - private final Integer code; - - - private final String desc; - - GenViewType(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-sys/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 deleted file mode 100644 index e5f7f66f7df035166022b65d011d75bc445fcc3d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/CustomListDeleteEvent.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lframework.xingyun.template.gen.events; - -import org.springframework.context.ApplicationEvent; - -public class CustomListDeleteEvent extends ApplicationEvent { - - /** - * 自定义列表ID - */ - private String id; - - /** - * 自定义列表名称 - */ - private String name; - - public CustomListDeleteEvent(Object source) { - super(source); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0225e3c9a3faf5781d37e1756a421a81d7c2df4d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDeleteEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lframework.xingyun.template.gen.events; - -import java.util.List; -import org.springframework.context.ApplicationEvent; - -public class DataEntityDeleteEvent extends ApplicationEvent { - - /** - * 数据实体ID - */ - private String id; - - /** - * 数据实体名称 - */ - private String name; - - private List columnIds; - - /** - * 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 DataEntityDeleteEvent(Object source) { - - super(source); - } - - public String getId() { - - return id; - } - - public void setId(String id) { - - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getColumnIds() { - - return columnIds; - } - - public void setColumnIds(List columnIds) { - - this.columnIds = columnIds; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7225e1a7c2d630c4e2eb3701afcbf1225426df17..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDetailDeleteEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lframework.xingyun.template.gen.events; - -import org.springframework.context.ApplicationEvent; - -public class DataEntityDetailDeleteEvent extends ApplicationEvent { - - /** - * 数据实体明细ID - */ - private String id; - - /** - * 显示名称 - */ - private String name; - - /** - * 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 DataEntityDetailDeleteEvent(Object source) { - - super(source); - } - - public String getId() { - - return id; - } - - public void setId(String id) { - - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a6b3ce634be42904ac9463365ce8a6c83d999fdc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataObjDeleteEvent.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.gen.events; - -import java.util.List; -import org.springframework.context.ApplicationEvent; - -public class DataObjDeleteEvent extends ApplicationEvent { - - /** - * 数据对象ID - */ - private String id; - - /** - * 数据对象名称 - */ - private String name; - - private List detailIds; - - private List queryDetailIds; - - /** - * 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 DataObjDeleteEvent(Object source) { - super(source); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getDetailIds() { - return detailIds; - } - - public void setDetailIds(List detailIds) { - this.detailIds = detailIds; - } - - public List getQueryDetailIds() { - return queryDetailIds; - } - - public void setQueryDetailIds(List queryDetailIds) { - this.queryDetailIds = queryDetailIds; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 81be25c390f0ef6405ed0740440d1439ce61eb1e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataObjQueryDetailDeleteEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lframework.xingyun.template.gen.events; - -import org.springframework.context.ApplicationEvent; - -public class DataObjQueryDetailDeleteEvent extends ApplicationEvent { - - /** - * 数据对象明细ID - */ - private String id; - - /** - * 显示名称 - */ - private String name; - - /** - * 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 DataObjQueryDetailDeleteEvent(Object source) { - - super(source); - } - - public String getId() { - - return id; - } - - public void setId(String id) { - - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3226fa69eadd0bf20de621c49eee488bfaae9a7f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java +++ /dev/null @@ -1,1658 +0,0 @@ -package com.lframework.xingyun.template.gen.generate; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -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.ObjectUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.bo.BaseBo; -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; -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.constants.MyBatisStringPool; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.mapper.BaseMapper; -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.service.BaseMpService; -import com.lframework.starter.web.utils.EnumUtil; -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.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -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; -import com.lframework.xingyun.template.gen.directives.FormatDirective; -import com.lframework.xingyun.template.gen.dto.generate.GenerateDto; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenKeyType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import com.lframework.xingyun.template.gen.generate.templates.ControllerTemplate; -import com.lframework.xingyun.template.gen.generate.templates.CreateTemplate; -import com.lframework.xingyun.template.gen.generate.templates.DetailTemplate; -import com.lframework.xingyun.template.gen.generate.templates.EntityTemplate; -import com.lframework.xingyun.template.gen.generate.templates.MapperTemplate; -import com.lframework.xingyun.template.gen.generate.templates.QueryParamsTemplate; -import com.lframework.xingyun.template.gen.generate.templates.QueryTemplate; -import com.lframework.xingyun.template.gen.generate.templates.ServiceTemplate; -import com.lframework.xingyun.template.gen.generate.templates.SqlTemplate; -import com.lframework.xingyun.template.gen.generate.templates.UpdateTemplate; -import com.lframework.xingyun.template.inner.entity.SysDataDic; -import com.lframework.xingyun.template.inner.service.system.SysDataDicItemService; -import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -import freemarker.ext.beans.BeansWrapper; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; -import freemarker.template.TemplateExceptionHandler; -import freemarker.template.TemplateHashModel; -import freemarker.template.TemplateModelException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; -import java.io.Serializable; -import java.io.StringWriter; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.extern.slf4j.Slf4j; -import org.hibernate.validator.constraints.Length; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.DeleteMapping; - -@Slf4j -public class Generator { - - private DataEntity dataEntity; - - private Generator() { - - } - - public static Generator getInstance(String entityId) { - - DataEntityBuilder builder = ApplicationUtil.getBean(DataEntityBuilder.class); - Generator generator = new Generator(); - - generator.setDataEntity(builder.build(entityId)); - - return generator; - } - - private void setDataEntity(DataEntity dataEntity) { - - this.dataEntity = dataEntity; - } - - public List generateAll() { - - List results = new ArrayList<>(); - // Java代码 - GenerateDto entityJava = this.generateEntity(); - GenerateDto mapperJava = this.generateMapper(); - GenerateDto mapperXml = this.generateListMapperXml(); - GenerateDto queryVoJava = this.generateQueryVo(); - GenerateDto createVoJava = this.generateCreateVo(); - GenerateDto updateVoJava = this.generateUpdateVo(); - GenerateDto serviceJava = this.generateService(); - GenerateDto serviceImplJava = this.generateServiceImpl(); - GenerateDto queryBoJava = this.generateQueryBo(); - GenerateDto getBoJava = this.generateGetBo(); - GenerateDto controllerJava = this.generateController(); - - results.add(entityJava); - if (queryVoJava != null) { - results.add(queryVoJava); - } - results.add(mapperJava); - results.add(mapperXml); - if (createVoJava != null) { - results.add(createVoJava); - } - if (updateVoJava != null) { - results.add(updateVoJava); - } - results.add(serviceJava); - results.add(serviceImplJava); - if (queryBoJava != null) { - results.add(queryBoJava); - } - if (getBoJava != null) { - results.add(getBoJava); - } - results.add(controllerJava); - - // Vue代码 - GenerateDto apiJs = this.generateApiJs(); - GenerateDto indexVue = this.generateIndexVue(); - 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); - if (addVue != null) { - results.add(addVue); - } - if (modifyVue != null) { - results.add(modifyVue); - } - 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(); - results.add(sql); - - return results; - } - - /** - * 生成Entity.java代码 - * - * @return - */ - public GenerateDto generateEntity() { - - EntityTemplate template = this.getEntityTemplate(); - - String content = this.generate("entity.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "entity", template.getClassName() + ".java", content); - } - - /** - * 生成Mapper.java代码 - * - * @return - */ - public GenerateDto generateMapper() { - - MapperTemplate template = this.getMapperTemplate(); - - String content = this.generate("mapper.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "mappers", template.getClassName() + "Mapper.java", content); - } - - /** - * 生成Mapper.xml代码 - * - * @return - */ - public GenerateDto generateListMapperXml() { - - MapperTemplate template = this.getMapperTemplate(); - - String content = this.generate("mapper.list.xml.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "resources" - + File.separator + "mappers" + File.separator + template.getModuleName(), - template.getClassName() + "Mapper.xml", content); - } - - /** - * 生成QueryVo.java代码 - * - * @return - */ - public GenerateDto generateQueryVo() { - - QueryParamsTemplate template = this.getQueryParamsTemplate(); - if (template == null) { - return null; - } - - String content = this.generate("queryvo.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "vo" - + File.separator + template.getModuleName() + File.separator + template.getBizName(), - "Query" + template.getClassName() + "Vo.java", content); - } - - /** - * 生成Service.java代码 - * - * @return - */ - public GenerateDto generateService() { - - ServiceTemplate template = this.getServiceTemplate(); - - String content = this.generate("service.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "service" + File.separator + template.getModuleName(), - template.getClassName() + "Service.java", content); - } - - /** - * 生成ServiceImpl.java代码 - * - * @return - */ - public GenerateDto generateServiceImpl() { - - ServiceTemplate template = this.getServiceTemplate(); - - String content = this.generate("serviceimpl.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "impl" - + File.separator + template.getModuleName(), - template.getClassName() + "ServiceImpl.java", - content); - } - - /** - * 生成CreateVo.java代码 - * - * @return - */ - public GenerateDto generateCreateVo() { - - CreateTemplate template = this.getCreateTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("createvo.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "vo" - + File.separator + template.getModuleName() + File.separator + template.getBizName(), - "Create" + template.getClassName() + "Vo.java", content); - } - - /** - * 生成UpdateVo.java代码 - * - * @return - */ - public GenerateDto generateUpdateVo() { - - UpdateTemplate template = this.getUpdateTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("updatevo.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "vo" - + File.separator + template.getModuleName() + File.separator + template.getBizName(), - "Update" + template.getClassName() + "Vo.java", content); - } - - /** - * 生成QueryBo.java代码 - * - * @return - */ - public GenerateDto generateQueryBo() { - - QueryTemplate template = this.getQueryTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("querybo.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "bo" - + File.separator + template.getModuleName() + File.separator + template.getBizName(), - "Query" + template.getClassName() + "Bo.java", content); - } - - /** - * 生成GetBo.java代码 - * - * @return - */ - public GenerateDto generateGetBo() { - - DetailTemplate template = this.getDetailTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("getbo.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "bo" - + File.separator + template.getModuleName() + File.separator + template.getBizName(), - "Get" + template.getClassName() + "Bo.java", content); - } - - /** - * 生成Controller.java代码 - * - * @return - */ - public GenerateDto generateController() { - - ControllerTemplate template = this.getControllerTemplate(); - - String content = this.generate("controller.java.ftl", template); - - return this.buildGenerateResult( - "java" + File.separator + "src" + File.separator + "main" + File.separator + "java" - + File.separator - + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator - + "controller" + File.separator + template.getModuleName(), - template.getClassName() + "Controller.java", content); - } - - /** - * 生成api.js代码 - * - * @return - */ - public GenerateDto generateApiJs() { - - ControllerTemplate template = this.getControllerTemplate(); - - String content = this.generate("api.ts.ftl", template); - - return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "api" + File.separator - + template.getModuleName() + File.separator + template.getBizName(), "index.ts", - content); - } - - /** - * 生成index.vue代码 - * - * @return - */ - public GenerateDto generateIndexVue() { - - ControllerTemplate template = this.getControllerTemplate(); - String content = this.generate("index.vue.ftl", template); - - return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "views" + File.separator - + template.getModuleName() - + File.separator + template.getBizName(), "index.vue", content); - } - - /** - * add.vue代码 - * - * @return - */ - public GenerateDto generateAddVue() { - - CreateTemplate template = this.getCreateTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("add.vue.ftl", template); - - return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "views" + File.separator - + template.getModuleName() - + File.separator + template.getBizName(), "add.vue", content); - } - - /** - * modify.vue代码 - * - * @return - */ - public GenerateDto generateModifyVue() { - - UpdateTemplate template = this.getUpdateTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("modify.vue.ftl", template); - - return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "views" + File.separator - + template.getModuleName() - + File.separator + template.getBizName(), "modify.vue", content); - } - - /** - * detail.vue代码 - * - * @return - */ - public GenerateDto generateDetailVue() { - - DetailTemplate template = this.getDetailTemplate(); - - if (template == null) { - return null; - } - - String content = this.generate("detail.vue.ftl", template); - - return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "views" + File.separator - + template.getModuleName() - + File.separator + template.getBizName(), "detail.vue", content); - } - - /** - * detail.vue代码 - * - * @return - */ - public GenerateDto generateSql() { - - SqlTemplate template = this.getSqlTemplate(); - - String content = this.generate("sql.ftl", template); - - return this.buildGenerateResult(StringPool.EMPTY_STR, "sql.sql", content); - } - - /** - * 获取freeMarker Template - * - * @param templateName - * @return - */ - private Template getTemplate(String templateName) { - - Configuration cfg = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); - cfg.setClassForTemplateLoading(Generator.class, "/templates"); - cfg.setDefaultEncoding("UTF-8"); - cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); - cfg.setSharedVariable(FormatDirective.DIRECTIVE_NAME, new FormatDirective()); - try { - return cfg.getTemplate(templateName); - } catch (IOException e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } - } - - /** - * Entity.java模板数据 - * - * @return - */ - private EntityTemplate getEntityTemplate() { - - EntityTemplate entityTemplate = new EntityTemplate(); - entityTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - entityTemplate.setTableName(dataEntity.getTable().getTableName()); - entityTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - entityTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - entityTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - entityTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - entityTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - - Set importPackages = new HashSet<>(); - importPackages.add(BaseEntity.class.getName()); - importPackages.add(BaseDto.class.getName()); - List columns = new ArrayList<>(); - for (DataEntityColumn column : dataEntity.getColumns()) { - EntityTemplate.Column columnObj = new EntityTemplate.Column(); - columnObj.setIsKey(column.getIsKey()); - if (columnObj.getIsKey()) { - // 如果是主键，判断是否是自增主键 - columnObj.setAutoIncrKey(dataEntity.getGenerateInfo().getKeyType() == GenKeyType.AUTO); - if (columnObj.getAutoIncrKey()) { - importPackages.add(TableId.class.getName()); - importPackages.add(IdType.class.getName()); - } - } - if (column.getFixEnum()) { - // 如果是枚举类型 - columnObj.setDataType( - column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); - columnObj.setFrontType(column.getEnumFront()); - importPackages.add(column.getEnumBack()); - } else { - columnObj.setDataType(column.getDataType().getDesc()); - } - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - columnObj.setName(column.getColumnName()); - // MybatisPlus默认命名规则是下划线转驼峰，所以如果不是这个规则的话，需要单独指定TableField和TableId - columnObj.setColumnName(column.getTableColumn().getDbColumnName()); - columnObj.setDefaultConvertType( - dataEntity.getTable().getConvertType() == GenConvertType.UNDERLINE_TO_CAMEL); - if (!columnObj.getDefaultConvertType()) { - importPackages.add(TableId.class.getName()); - importPackages.add(TableField.class.getName()); - } - columnObj.setDescription(column.getName()); - if (!columnObj.getIsKey()) { - // 如果不是主键，需要判断是否需要字段填充 - if (MyBatisStringPool.COLUMN_CREATE_BY.equals(columnObj.getName()) - || MyBatisStringPool.COLUMN_CREATE_BY_ID.equals(columnObj.getName()) - || MyBatisStringPool.COLUMN_CREATE_TIME.equals(columnObj.getName())) { - columnObj.setFill(Boolean.TRUE); - columnObj.setFillStrategy(FieldFill.INSERT.name()); - importPackages.add(TableField.class.getName()); - importPackages.add(FieldFill.class.getName()); - } else if (MyBatisStringPool.COLUMN_UPDATE_BY.equals(columnObj.getName()) - || MyBatisStringPool.COLUMN_UPDATE_BY_ID.equals(columnObj.getName()) - || MyBatisStringPool.COLUMN_UPDATE_TIME.equals(columnObj.getName())) { - columnObj.setFill(Boolean.TRUE); - columnObj.setFillStrategy(FieldFill.INSERT_UPDATE.name()); - importPackages.add(TableField.class.getName()); - importPackages.add(FieldFill.class.getName()); - } - } - - columns.add(columnObj); - } - entityTemplate.setColumns(columns); - - entityTemplate.setImportPackages(importPackages); - - 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模板数据 - * - * @return - */ - private MapperTemplate getMapperTemplate() { - - MapperTemplate mapperTemplate = new MapperTemplate(); - mapperTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - mapperTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - mapperTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - mapperTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - mapperTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - mapperTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - Set importPackages = new HashSet<>(); - importPackages.add(BaseMapper.class.getName()); - List keys = new ArrayList<>(); - for (DataEntityColumn column : dataEntity.getColumns()) { - if (column.getIsKey()) { - MapperTemplate.Key key = new MapperTemplate.Key(); - // 主键不允许是枚举，所以直接取desc - key.setDataType(column.getDataType().getDesc()); - key.setName(column.getColumnName()); - key.setColumnName(column.getTableColumn().getDbColumnName()); - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - keys.add(key); - } - } - - mapperTemplate.setKeys(keys); - List orderColumns = new ArrayList<>(); - for (DataEntityColumn column : dataEntity.getColumns()) { - if (!column.getIsOrder()) { - continue; - } - MapperTemplate.OrderColumn orderColumn = new MapperTemplate.OrderColumn(); - orderColumn.setColumnName(column.getTableColumn().getDbColumnName()); - orderColumn.setOrderType(column.getOrderType().getCode()); - orderColumns.add(orderColumn); - } - mapperTemplate.setOrderColumns(orderColumns); - mapperTemplate.setEntity(this.getEntityTemplate()); - mapperTemplate.setImportPackages(importPackages); - mapperTemplate.setQueryParams(this.getQueryParamsTemplate()); - if (mapperTemplate.getQueryParams() != null) { - mapperTemplate.getImportPackages() - .addAll(mapperTemplate.getQueryParams().getImportPackages()); - } - - return mapperTemplate; - } - - private ServiceTemplate getServiceTemplate() { - - ServiceTemplate serviceTemplate = new ServiceTemplate(); - serviceTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - serviceTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - serviceTemplate.setClassNameProperty( - dataEntity.getGenerateInfo().getClassName().substring(0, 1).toLowerCase() - + dataEntity.getGenerateInfo() - .getClassName().substring(1)); - serviceTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - serviceTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - serviceTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - serviceTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - serviceTemplate.setIsCache(dataEntity.getGenerateInfo().getIsCache()); - serviceTemplate.setHasDelete(dataEntity.getGenerateInfo().getHasDelete()); - Set importPackages = new HashSet<>(); - importPackages.add(PageResult.class.getName()); - importPackages.add(BaseMpService.class.getName()); - importPackages.add(StringUtil.class.getName()); - importPackages.add(BaseMpServiceImpl.class.getName()); - importPackages.add(DefaultClientException.class.getName()); - importPackages.add(Assert.class.getName()); - importPackages.add(ObjectUtil.class.getName()); - importPackages.add(OpLog.class.getName()); - importPackages.add(DefaultOpLogType.class.getName()); - importPackages.add(OpLogUtil.class.getName()); - importPackages.add(PageHelperUtil.class.getName()); - importPackages.add(PageResultUtil.class.getName()); - importPackages.add(EnumUtil.class.getName()); - if (serviceTemplate.getHasDelete()) { - importPackages.add(Transactional.class.getName()); - } - List keys = new ArrayList<>(); - for (DataEntityColumn column : dataEntity.getColumns()) { - if (column.getIsKey()) { - ServiceTemplate.Key key = new ServiceTemplate.Key(); - // 主键不允许是枚举，所以直接取desc - key.setDataType(column.getDataType().getDesc()); - key.setName(column.getColumnName()); - key.setNameProperty( - column.getColumnName().substring(0, 1).toUpperCase() + column.getColumnName() - .substring(1)); - key.setColumnName(column.getTableColumn().getDbColumnName()); - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - keys.add(key); - } - } - - serviceTemplate.setKeys(keys); - serviceTemplate.setImportPackages(importPackages); - serviceTemplate.setQueryParams(this.getQueryParamsTemplate()); - serviceTemplate.setCreate(this.getCreateTemplate()); - serviceTemplate.setUpdate(this.getUpdateTemplate()); - if (serviceTemplate.getIsCache()) { - importPackages.add(Serializable.class.getName()); - } - if (serviceTemplate.getQueryParams() != null) { - serviceTemplate.getImportPackages() - .addAll(serviceTemplate.getQueryParams().getImportPackages()); - } - if (serviceTemplate.getCreate() != null) { - serviceTemplate.getImportPackages().addAll(serviceTemplate.getCreate().getImportPackages()); - } - if (serviceTemplate.getUpdate() != null) { - serviceTemplate.getImportPackages().addAll(serviceTemplate.getUpdate().getImportPackages()); - } - - return serviceTemplate; - } - - private QueryParamsTemplate getQueryParamsTemplate() { - - List targetColumns = dataEntity.getColumns().stream() - .filter(t -> t.getQueryParamsConfig() != null) - .sorted(Comparator.comparing(t -> t.getQueryParamsConfig().getOrderNo())) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(targetColumns)) { - return null; - } - QueryParamsTemplate queryParamsTemplate = new QueryParamsTemplate(); - queryParamsTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - queryParamsTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - queryParamsTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - queryParamsTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - queryParamsTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - queryParamsTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - Set importPackages = new HashSet<>(); - importPackages.add(BaseVo.class.getName()); - importPackages.add(PageVo.class.getName()); - importPackages.add(TypeMismatch.class.getName()); - importPackages.add(ApiModelProperty.class.getName()); - List columns = new ArrayList<>(); - for (DataEntityColumn column : targetColumns) { - QueryParamsTemplate.Column columnObj = new QueryParamsTemplate.Column(); - if (column.getFixEnum()) { - // 如果是枚举类型 - 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()); - } - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - columnObj.setName(column.getColumnName()); - columnObj.setColumnName(column.getTableColumn().getDbColumnName()); - columnObj.setQueryType(column.getQueryParamsConfig().getQueryType().getCode()); - columnObj.setNameProperty( - column.getColumnName().substring(0, 1).toUpperCase() + column.getColumnName() - .substring(1)); - columnObj.setDescription(column.getName()); - columnObj.setHasAvailableTag( - column.getViewType() == GenViewType.SELECT && column.getDataType() == GenDataType.BOOLEAN - && "available".equals(column.getColumnName())); - columnObj.setFixEnum(column.getFixEnum()); - if (!StringUtil.isBlank(column.getRegularExpression())) { - columnObj.setRegularExpression(column.getRegularExpression()); - importPackages.add(Pattern.class.getName()); - } - if (column.getViewType() == GenViewType.DATA_DIC) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(column.getDataDicId()); - columnObj.setDataDicCode(dic.getCode()); - } else if (column.getViewType() == GenViewType.CUSTOM_SELECTOR) { - columnObj.setCustomSelectorId(column.getCustomSelectorId()); - } - - columns.add(columnObj); - } - queryParamsTemplate.setColumns(columns); - queryParamsTemplate.setImportPackages(importPackages); - - return queryParamsTemplate; - } - - private CreateTemplate getCreateTemplate() { - - List targetColumns = dataEntity.getColumns().stream() - .filter(t -> t.getCreateConfig() != null) - .sorted(Comparator.comparing(t -> t.getCreateConfig().getOrderNo())) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(targetColumns)) { - return null; - } - Set importPackages = new HashSet<>(); - importPackages.add(ApiModelProperty.class.getName()); - CreateTemplate createTemplate = new CreateTemplate(); - createTemplate.setAppointId(dataEntity.getGenerateInfo().getKeyType() != GenKeyType.AUTO); - if (dataEntity.getGenerateInfo().getKeyType() == GenKeyType.UUID) { - // 如果是UUID，则引入IdUtil包 - importPackages.add(IdUtil.class.getName()); - createTemplate.setIdCode(IdUtil.class.getSimpleName() + ".getUUID()"); - } else if (dataEntity.getGenerateInfo().getKeyType() == GenKeyType.SNOW_FLAKE) { - // 如果是雪花算法，则引入IdWorker包 - importPackages.add(IdUtil.class.getName()); - createTemplate.setIdCode(IdUtil.class.getSimpleName() + ".getId()"); - } - createTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - createTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - createTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - createTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - createTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - createTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - importPackages.add(TypeMismatch.class.getName()); - importPackages.add(BaseVo.class.getName()); - - List columns = new ArrayList<>(); - for (DataEntityColumn column : targetColumns) { - CreateTemplate.Column columnObj = new CreateTemplate.Column(); - columnObj.setIsKey(column.getIsKey()); - columnObj.setRequired(column.getCreateConfig().getRequired()); - if (column.getFixEnum()) { - // 如果是枚举类型 - 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) { - columnObj.setViewType(GenViewType.DATETIME.getCode()); - } else { - columnObj.setViewType(GenViewType.DATE.getCode()); - } - } - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - columnObj.setFixEnum(column.getFixEnum()); - if (columnObj.getFixEnum()) { - columnObj.setEnumCodeType(column.getDataType().getDesc()); - } - if (columnObj.getRequired()) { - // 如果必填，那么需要引Validation注解包 - if (column.getDataType() == GenDataType.STRING) { - // 如果是String，则引@NotBlank注解 - columnObj.setValidateAnno(NotBlank.class.getSimpleName()); - importPackages.add(NotBlank.class.getName()); - } else { - // 否则引@NotNull注解 - columnObj.setValidateAnno(NotNull.class.getSimpleName()); - importPackages.add(NotNull.class.getName()); - } - - if (column.getViewType() == GenViewType.SELECT - || column.getViewType() == GenViewType.DATA_DIC) { - columnObj.setValidateMsg("请选择"); - } else { - columnObj.setValidateMsg("请输入"); - } - - if (columnObj.getFixEnum()) { - // 如果是内置枚举，那么引IsEnum注解包 - importPackages.add(IsEnum.class.getName()); - } - } - columnObj.setName(column.getColumnName()); - columnObj.setColumnName(column.getTableColumn().getDbColumnName()); - columnObj.setNameProperty( - column.getColumnName().substring(0, 1).toUpperCase() + column.getColumnName() - .substring(1)); - columnObj.setDescription(column.getName()); - columnObj.setHasAvailableTag( - column.getViewType() == GenViewType.SELECT && column.getDataType() == GenDataType.BOOLEAN - && "available".equals(column.getColumnName())); - if (!StringUtil.isBlank(column.getRegularExpression())) { - columnObj.setRegularExpression(column.getRegularExpression()); - importPackages.add(Pattern.class.getName()); - } - - columnObj.setIsNumberType(GenDataType.isNumberType(column.getDataType())); - columnObj.setIsDecimalType(GenDataType.isDecimalType(column.getDataType())); - if (column.getViewType() == GenViewType.DATA_DIC) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(column.getDataDicId()); - columnObj.setDataDicCode(dic.getCode()); - } else if (column.getViewType() == GenViewType.CUSTOM_SELECTOR) { - columnObj.setCustomSelectorId(column.getCustomSelectorId()); - } - columnObj.setLen(column.getLen()); - columnObj.setDecimals(column.getDecimals()); - if (columnObj.getIsNumberType()) { - if (columnObj.getIsDecimalType()) { - importPackages.add(IsNumberPrecision.class.getName()); - } - } else if (column.getDataType() == GenDataType.STRING) { - if (column.getViewType() == GenViewType.INPUT - || column.getViewType() == GenViewType.TEXTATREA) { - importPackages.add(Length.class.getName()); - } - } - columns.add(columnObj); - } - - createTemplate.setColumns(columns); - createTemplate.setImportPackages(importPackages); - List keyColumns = dataEntity.getColumns().stream() - .filter(DataEntityColumn::getIsKey) - .collect(Collectors.toList()); - List keys = keyColumns.stream().map(t -> { - CreateTemplate.Key key = new CreateTemplate.Key(); - // 主键不会是枚举 - key.setDataType(t.getDataType().getDesc()); - key.setName(t.getColumnName()); - key.setNameProperty( - t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); - key.setColumnName(t.getTableColumn().getDbColumnName()); - key.setDescription(t.getName()); - - return key; - }).collect(Collectors.toList()); - - createTemplate.setKeys(keys); - - return createTemplate; - } - - private UpdateTemplate getUpdateTemplate() { - - List targetColumns = dataEntity.getColumns().stream() - .filter(t -> t.getUpdateConfig() != null) - .sorted(Comparator.comparing(t -> t.getUpdateConfig().getOrderNo())) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(targetColumns)) { - return null; - } - Set importPackages = new HashSet<>(); - UpdateTemplate updateTemplate = new UpdateTemplate(); - updateTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - updateTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - updateTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - updateTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - updateTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - updateTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - importPackages.add(TypeMismatch.class.getName()); - importPackages.add(ApiModelProperty.class.getName()); - importPackages.add(BaseVo.class.getName()); - - List columns = new ArrayList<>(); - for (DataEntityColumn column : targetColumns) { - UpdateTemplate.Column columnObj = new UpdateTemplate.Column(); - columnObj.setIsKey(column.getIsKey()); - columnObj.setRequired(column.getUpdateConfig().getRequired()); - if (column.getFixEnum()) { - // 如果是枚举类型 - columnObj.setDataType( - 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) { - if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - columnObj.setViewType(GenViewType.DATETIME.getCode()); - } else { - columnObj.setViewType(GenViewType.DATE.getCode()); - } - } - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - columnObj.setFixEnum(column.getFixEnum()); - if (columnObj.getFixEnum()) { - columnObj.setEnumCodeType(column.getDataType().getDesc()); - } - if (columnObj.getRequired()) { - // 如果必填，那么需要引Validation注解包 - if (column.getDataType() == GenDataType.STRING) { - // 如果是String，则引@NotBlank注解 - columnObj.setValidateAnno(NotBlank.class.getSimpleName()); - importPackages.add(NotBlank.class.getName()); - } else { - // 否则引@NotNull注解 - columnObj.setValidateAnno(NotNull.class.getSimpleName()); - importPackages.add(NotNull.class.getName()); - } - - if (column.getViewType() == GenViewType.SELECT - || column.getViewType() == GenViewType.DATA_DIC) { - columnObj.setValidateMsg("请选择"); - } else { - columnObj.setValidateMsg("请输入"); - } - - if (columnObj.getFixEnum()) { - // 如果是内置枚举，那么引IsEnum注解包 - importPackages.add(IsEnum.class.getName()); - } - } - columnObj.setName(column.getColumnName()); - columnObj.setColumnName(column.getTableColumn().getDbColumnName()); - columnObj.setNameProperty( - column.getColumnName().substring(0, 1).toUpperCase() + column.getColumnName() - .substring(1)); - columnObj.setDescription(column.getName()); - columnObj.setHasAvailableTag( - column.getViewType() == GenViewType.SELECT && column.getDataType() == GenDataType.BOOLEAN - && "available".equals(column.getColumnName())); - if (!StringUtil.isBlank(column.getRegularExpression())) { - columnObj.setRegularExpression(column.getRegularExpression()); - importPackages.add(Pattern.class.getName()); - } - columnObj.setIsNumberType(GenDataType.isNumberType(column.getDataType())); - columnObj.setIsDecimalType(GenDataType.isDecimalType(column.getDataType())); - columnObj.setLen(column.getLen()); - columnObj.setDecimals(column.getDecimals()); - if (columnObj.getIsNumberType()) { - if (columnObj.getIsDecimalType()) { - importPackages.add(IsNumberPrecision.class.getName()); - } - } else if (column.getDataType() == GenDataType.STRING) { - if (column.getViewType() == GenViewType.INPUT - || column.getViewType() == GenViewType.TEXTATREA) { - importPackages.add(Length.class.getName()); - } - } - - if (column.getViewType() == GenViewType.DATA_DIC) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(column.getDataDicId()); - columnObj.setDataDicCode(dic.getCode()); - } else if (column.getViewType() == GenViewType.CUSTOM_SELECTOR) { - columnObj.setCustomSelectorId(column.getCustomSelectorId()); - } - - columns.add(columnObj); - } - - updateTemplate.setColumns(columns); - updateTemplate.setImportPackages(importPackages); - List keyColumns = dataEntity.getColumns().stream() - .filter(DataEntityColumn::getIsKey) - .collect(Collectors.toList()); - List keys = keyColumns.stream().map(t -> { - 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)); - key.setColumnName(t.getTableColumn().getDbColumnName()); - key.setDescription(t.getName()); - if (t.getDataType() == GenDataType.STRING) { - // 如果是String，则引@NotBlank注解 - importPackages.add(NotBlank.class.getName()); - } else { - // 否则引@NotNull注解 - importPackages.add(NotNull.class.getName()); - } - return key; - }).collect(Collectors.toList()); - updateTemplate.setKeys(keys); - - return updateTemplate; - } - - private QueryTemplate getQueryTemplate() { - - List targetColumns = dataEntity.getColumns().stream() - .filter(t -> t.getQueryConfig() != null) - .sorted(Comparator.comparing(t -> t.getQueryConfig().getOrderNo())) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(targetColumns)) { - return null; - } - QueryTemplate queryTemplate = new QueryTemplate(); - queryTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - queryTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - queryTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - queryTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - queryTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - queryTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - - Set importPackages = new HashSet<>(); - importPackages.add(TypeMismatch.class.getName()); - importPackages.add(ApiModelProperty.class.getName()); - importPackages.add(StringPool.class.getName()); - importPackages.add(BaseBo.class.getName()); - List columns = new ArrayList<>(); - for (DataEntityColumn column : targetColumns) { - QueryTemplate.Column columnObj = new QueryTemplate.Column(); - if (column.getFixEnum()) { - // 如果是枚举类型 - 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( - column.getViewType() == GenViewType.SELECT - && column.getDataType() == GenDataType.BOOLEAN - && "available".equals(column.getColumnName())); - } - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - columnObj.setFixEnum(column.getFixEnum()); - if (columnObj.getFixEnum()) { - columnObj.setEnumCodeType(column.getDataType().getDesc()); - } - columnObj.setName(column.getColumnName()); - columnObj.setNameProperty( - column.getColumnName().substring(0, 1).toUpperCase() + column.getColumnName() - .substring(1)); - columnObj.setWidthType(column.getQueryConfig().getWidthType().getCode()); - columnObj.setWidth(column.getQueryConfig().getWidth()); - columnObj.setSortable(column.getQueryConfig().getSortable()); - columnObj.setDescription(column.getName()); - if (column.getViewType() == GenViewType.DATA_DIC) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(column.getDataDicId()); - columnObj.setDataDicCode(dic.getCode()); - importPackages.add(SysDataDicItemService.class.getName()); - importPackages.add(StringUtil.class.getName()); - importPackages.add(ApplicationUtil.class.getName()); - importPackages.add(StringPool.class.getName()); - } - - columns.add(columnObj); - } - - queryTemplate.setColumns(columns); - queryTemplate.setHasFixEnum(columns.stream().anyMatch(QueryTemplate.Column::getFixEnum)); - - List keyColumns = dataEntity.getColumns().stream() - .filter(DataEntityColumn::getIsKey) - .collect(Collectors.toList()); - List keys = keyColumns.stream().map(t -> { - 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)); - key.setDescription(t.getName()); - - return key; - }).collect(Collectors.toList()); - - queryTemplate.setKeys(keys); - - queryTemplate.setImportPackages(importPackages); - - return queryTemplate; - } - - private DetailTemplate getDetailTemplate() { - - List targetColumns = dataEntity.getColumns().stream() - .filter(t -> t.getDetailConfig() != null) - .sorted(Comparator.comparing(t -> t.getDetailConfig().getOrderNo())) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(targetColumns)) { - return null; - } - DetailTemplate detailTemplate = new DetailTemplate(); - detailTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - detailTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - detailTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - detailTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - detailTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - detailTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - - Set importPackages = new HashSet<>(); - importPackages.add(TypeMismatch.class.getName()); - importPackages.add(ApiModelProperty.class.getName()); - importPackages.add(StringPool.class.getName()); - importPackages.add(BaseBo.class.getName()); - List columns = new ArrayList<>(); - for (DataEntityColumn column : targetColumns) { - DetailTemplate.Column columnObj = new DetailTemplate.Column(); - if (column.getFixEnum()) { - // 如果是枚举类型 - 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 - && "available".equals(column.getColumnName())); - if (columnObj.getHasAvailableTag()) { - detailTemplate.setHasAvailableTag(Boolean.TRUE); - } - } - // 以下类型需要单独引包 - if (column.getDataType() == GenDataType.LOCAL_DATE) { - importPackages.add(LocalDate.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { - importPackages.add(LocalDateTime.class.getName()); - } else if (column.getDataType() == GenDataType.LOCAL_TIME) { - importPackages.add(LocalTime.class.getName()); - } else if (column.getDataType() == GenDataType.BIG_DECIMAL) { - importPackages.add(BigDecimal.class.getName()); - } - columnObj.setFixEnum(column.getFixEnum()); - if (columnObj.getFixEnum()) { - columnObj.setEnumCodeType(column.getDataType().getDesc()); - } - columnObj.setName(column.getColumnName()); - columnObj.setNameProperty( - column.getColumnName().substring(0, 1).toUpperCase() + column.getColumnName() - .substring(1)); - columnObj.setDescription(column.getName()); - columnObj.setSpan(column.getDetailConfig().getSpan()); - - if (column.getViewType() == GenViewType.DATA_DIC) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dic = sysDataDicService.findById(column.getDataDicId()); - columnObj.setDataDicCode(dic.getCode()); - importPackages.add(SysDataDicItemService.class.getName()); - importPackages.add(StringUtil.class.getName()); - importPackages.add(ApplicationUtil.class.getName()); - importPackages.add(StringPool.class.getName()); - } - - columns.add(columnObj); - } - - detailTemplate.setColumns(columns); - detailTemplate.setHasFixEnum(columns.stream().anyMatch(DetailTemplate.Column::getFixEnum)); - detailTemplate.setDetailSpan(dataEntity.getGenerateInfo().getDetailSpan()); - List keyColumns = dataEntity.getColumns().stream() - .filter(DataEntityColumn::getIsKey) - .collect(Collectors.toList()); - List keys = keyColumns.stream().map(t -> { - 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)); - key.setDescription(t.getName()); - - return key; - }).collect(Collectors.toList()); - - detailTemplate.setKeys(keys); - - detailTemplate.setImportPackages(importPackages); - - return detailTemplate; - } - - private ControllerTemplate getControllerTemplate() { - - Set importPackages = new HashSet<>(); - ControllerTemplate controllerTemplate = new ControllerTemplate(); - controllerTemplate.setPackageName(dataEntity.getGenerateInfo().getPackageName()); - controllerTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - controllerTemplate.setClassNameProperty( - dataEntity.getGenerateInfo().getClassName().substring(0, 1).toLowerCase() - + dataEntity.getGenerateInfo() - .getClassName().substring(1)); - controllerTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - controllerTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - controllerTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - controllerTemplate.setAuthor(dataEntity.getGenerateInfo().getAuthor()); - controllerTemplate.setIsCache(dataEntity.getGenerateInfo().getIsCache()); - controllerTemplate.setHasDelete(dataEntity.getGenerateInfo().getHasDelete()); - if (controllerTemplate.getHasDelete()) { - importPackages.add(DeleteMapping.class.getName()); - } - importPackages.add(DefaultClientException.class.getName()); - importPackages.add(CollectionUtil.class.getName()); - importPackages.add(PageResult.class.getName()); - importPackages.add(PageResultUtil.class.getName()); - importPackages.add(InvokeResult.class.getName()); - importPackages.add(InvokeResultBuilder.class.getName()); - importPackages.add(Api.class.getName()); - importPackages.add(ApiOperation.class.getName()); - importPackages.add(ApiImplicitParam.class.getName()); - importPackages.add(ApiImplicitParams.class.getName()); - - List keyColumns = dataEntity.getColumns().stream() - .filter(DataEntityColumn::getIsKey) - .collect(Collectors.toList()); - List keys = keyColumns.stream().map(t -> { - ControllerTemplate.Key key = new ControllerTemplate.Key(); - // 主键不会是枚举 - key.setDataType(t.getDataType().getDesc()); - key.setName(t.getColumnName()); - key.setNameProperty(t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName() - .substring(1)); - - if (t.getDataType() == GenDataType.STRING) { - importPackages.add(NotBlank.class.getName()); - } else { - importPackages.add(NotNull.class.getName()); - } - - return key; - }).collect(Collectors.toList()); - - controllerTemplate.setKeys(keys); - controllerTemplate.setImportPackages(importPackages); - controllerTemplate.setCreate(this.getCreateTemplate()); - controllerTemplate.setUpdate(this.getUpdateTemplate()); - controllerTemplate.setQuery(this.getQueryTemplate()); - controllerTemplate.setQueryParams(this.getQueryParamsTemplate()); - controllerTemplate.setDetail(this.getDetailTemplate()); - if (controllerTemplate.getCreate() != null) { - importPackages.addAll(controllerTemplate.getCreate().getImportPackages()); - } - if (controllerTemplate.getUpdate() != null) { - importPackages.addAll(controllerTemplate.getUpdate().getImportPackages()); - } - if (controllerTemplate.getQuery() != null) { - importPackages.addAll(controllerTemplate.getQuery().getImportPackages()); - if (!controllerTemplate.getHasAvailableTag()) { - controllerTemplate.setHasAvailableTag(controllerTemplate.getQuery().getColumns().stream() - .anyMatch(QueryTemplate.Column::getHasAvailableTag)); - } - } - if (controllerTemplate.getQueryParams() != null) { - importPackages.addAll(controllerTemplate.getQueryParams().getImportPackages()); - if (!controllerTemplate.getHasAvailableTag()) { - controllerTemplate.setHasAvailableTag( - controllerTemplate.getQueryParams().getColumns().stream() - .anyMatch(QueryParamsTemplate.Column::getHasAvailableTag)); - } - } - if (controllerTemplate.getDetail() != null) { - importPackages.addAll(controllerTemplate.getDetail().getImportPackages()); - } - - return controllerTemplate; - } - - private SqlTemplate getSqlTemplate() { - - SqlTemplate sqlTemplate = new SqlTemplate(); - sqlTemplate.setModuleName(dataEntity.getGenerateInfo().getModuleName()); - sqlTemplate.setBizName(dataEntity.getGenerateInfo().getBizName()); - sqlTemplate.setClassName(dataEntity.getGenerateInfo().getClassName()); - sqlTemplate.setClassDescription(dataEntity.getGenerateInfo().getClassDescription()); - sqlTemplate.setParentMenuId(dataEntity.getGenerateInfo().getParentMenuId()); - sqlTemplate.setMenuId(dataEntity.getGenerateInfo().getId()); - sqlTemplate.setMenuCode(dataEntity.getGenerateInfo().getMenuCode()); - sqlTemplate.setMenuName(dataEntity.getGenerateInfo().getMenuName()); - sqlTemplate.setCreate(this.getCreateTemplate()); - sqlTemplate.setUpdate(this.getUpdateTemplate()); - - return sqlTemplate; - } - - /** - * 生成代码 - * - * @param templateName 模板名称 - * @param data 数据 - * @return - */ - private String generate(String templateName, Object data) { - - Template template = this.getTemplate(templateName); - Map root = JsonUtil.convert(data, Map.class); - StringWriter stringWriter = new StringWriter(); - BufferedWriter writer = new BufferedWriter(stringWriter); - - loadStaticClasses(root); - - try { - template.process(root, writer); - } catch (TemplateException | IOException e) { - log.error(e.getMessage(), e); - throw new DefaultSysException(e.getMessage()); - } - - return stringWriter.toString(); - } - - private GenerateDto buildGenerateResult(String path, String fileName, String content) { - - if (StringUtil.isBlank(content)) { - return null; - } - GenerateDto result = new GenerateDto(); - result.setPath(path); - result.setFileName(fileName); - result.setContent(content); - - return result; - } - - private void loadStaticClasses(Map root) { - - BeansWrapper wrapper = BeansWrapper.getDefaultInstance(); - - TemplateHashModel staticModels = wrapper.getStaticModels(); - - TemplateHashModel fileStatics = null; - try { - fileStatics = (TemplateHashModel) staticModels.get(IdUtil.class.getName()); - } catch (TemplateModelException e) { - log.error("加载静态类失败", e); - throw new DefaultSysException("加载静态类失败"); - } - - root.put(IdUtil.class.getSimpleName(), fileStatics); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 88aa822bdef2e69f8ada3aca2591c7ef5c46acaa..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ControllerTemplate.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 用于Controller.java、index.vue、api.js生成 - */ -@Data -public class ControllerTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 类名（首字母小写） - */ - private String classNameProperty; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 是否应用缓存 - */ - private Boolean isCache; - - /** - * 是否内置删除功能 - */ - private Boolean hasDelete; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 主键 - */ - private List keys; - - /** - * 需要import的包 - */ - private Set importPackages; - - /** - * 新增配置 - */ - private CreateTemplate create; - - /** - * 修改配置 - */ - private UpdateTemplate update; - - /** - * 查询配置 - */ - private QueryTemplate query; - - /** - * 查询参数配置 - */ - private QueryParamsTemplate queryParams; - - /** - * 详情配置 - */ - private DetailTemplate detail; - - @Data - public static class Key { - - /** - * 类型 - */ - private String dataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6409297e23ef4cc7e2e5c30890fa81fde842eeb7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java +++ /dev/null @@ -1,210 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 新增功能Template - */ -@Data -public class CreateTemplate { - - /** - * 是否指定ID 如果是自增ID就不需要指定ID - */ - private Boolean appointId; - - /** - * 指定ID的代码 当appointId == true时生效 - */ - private String idCode; - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 字段 - */ - private List columns; - - /** - * 需要import的包 - */ - private Set importPackages; - - /** - * 主键 - */ - private List keys; - - @Data - public static class Key { - - /** - * 字段类型 - */ - private String dataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段名 - */ - private String columnName; - - /** - * 字段备注 - */ - private String description; - } - - @Data - public static class Column { - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 是否必填 - */ - private Boolean required; - - /** - * 验证注解 - */ - private String validateAnno; - - /** - * 验证信息 当required == true时生效 - */ - private String validateMsg; - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 枚举的Code的类型 当fixEnum == true时生效 - */ - private String enumCodeType; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - private String frontType; - - /** - * 显示类型 - */ - private Integer viewType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段名 - */ - private String columnName; - - /** - * 正则表达式 - */ - private String regularExpression; - - /** - * 字段备注 - */ - private String description; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 是否数字类型 - */ - private Boolean isNumberType = Boolean.FALSE; - - /** - * 是否小数类型 - */ - private Boolean isDecimalType = Boolean.FALSE; - - /** - * 数据字典编号 - */ - private String dataDicCode; - - /** - * 自定义选择器ID - */ - private String customSelectorId; - - /** - * 长度 - */ - private Long len; - - /** - * 小数点位数 - */ - private Integer decimals; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index dfd38ca090f1151a903e4a924ed004d53cee9898..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 详情功能Template - */ -@Data -public class DetailTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 字段 - */ - private List columns; - - /** - * 主键 - */ - private List keys; - - /** - * 是否存在内置枚举 - */ - private Boolean hasFixEnum; - - /** - * 详情页Span总数量 - */ - private Integer detailSpan; - - /** - * 需要import的包 - */ - private Set importPackages; - - @Data - public static class Key { - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段备注 - */ - private String description; - } - - @Data - public static class Column { - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 枚举的Code的类型 当fixEnum == true时生效 - */ - private String enumCodeType; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - private String frontType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段备注 - */ - private String description; - - /** - * 列宽 - */ - private Integer span; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 数据字典Code - */ - private String dataDicCode; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ea5fae3f29eafe8ecddea0d8f28e862fbff10e06..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/EntityTemplate.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 实体类Template - */ -@Data -public class EntityTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 库表名 - */ - private String tableName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 列信息 - */ - private List columns; - - /** - * 需要import的包 - */ - private Set importPackages; - - @Data - public static class Column { - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 是否自增主键 - */ - private Boolean autoIncrKey; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - private String frontType; - - /** - * 字段名称 - */ - private String name; - - /** - * 是否默认字段名转换方式（下划线转驼峰） - */ - private Boolean defaultConvertType; - - /** - * 数据库字段名称 - */ - private String columnName; - - /** - * 字段备注 - */ - private String description; - - /** - * 是否填充字段 isKey == false时生效 - */ - private Boolean fill; - - /** - * 填充策略 - */ - private String fillStrategy; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7ad90507f2b57eef2987e39de98ed124aadfda32..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/MapperTemplate.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 用于生成Mapper.java、Mapper.xml - */ -@Data -public class MapperTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 主键 - */ - private List keys; - - /** - * 排序字段 - */ - private List orderColumns; - - /** - * 实体类配置 - */ - private EntityTemplate entity; - - /** - * 需要import的包 - */ - private Set importPackages; - - /** - * 查询参数配置 - */ - private QueryParamsTemplate queryParams; - - @Data - public static class Key { - - /** - * 类型 - */ - private String dataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 数据表列名 - */ - private String columnName; - } - - @Data - public static class OrderColumn { - - /** - * 数据表列名 - */ - private String columnName; - - /** - * 排序类型 - */ - private String orderType; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 51a5443409fdbdbee08e87f68a6cce376e0ef545..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 查询参数Template - */ -@Data -public class QueryParamsTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 字段 - */ - private List columns; - - /** - * 需要import的包 - */ - private Set importPackages; - - @Data - public static class Column { - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 正则表达式 - */ - private String regularExpression; - - /** - * 枚举的Code的类型 当fixEnum == true时生效 - */ - private String enumCodeType; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - private String frontType; - - /** - * 显示类型 - */ - private Integer viewType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段名 - */ - private String columnName; - - /** - * 查询类型 - */ - private Integer queryType; - - /** - * 字段备注 - */ - private String description; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 数据字典Code - */ - private String dataDicCode; - - /** - * 自定义选择器ID - */ - private String customSelectorId; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0ce6dc486599b8da4c0fcb51e4295879b425dc71..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 查询功能Template - */ -@Data -public class QueryTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 字段 - */ - private List columns; - - /** - * 主键 - */ - private List keys; - - /** - * 是否存在内置枚举 - */ - private Boolean hasFixEnum; - - /** - * 需要import的包 - */ - private Set importPackages; - - @Data - public static class Key { - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段备注 - */ - private String description; - } - - @Data - public static class Column { - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 枚举的Code的类型 当fixEnum == true时生效 - */ - private String enumCodeType; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - private String frontType; - - /** - * 是否数字类型 - */ - private Boolean isNumberType = Boolean.FALSE; - - /** - * 显示类型 - */ - private Integer viewType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 宽度类型 - */ - private Integer widthType; - - /** - * 宽度 - */ - private Integer width; - - /** - * 是否页面排序 - */ - private Boolean sortable; - - /** - * 字段备注 - */ - private String description; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 数据字典Code - */ - private String dataDicCode; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 457f4e179255affc5795633185970edb44c578ab..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ServiceTemplate.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 用于Service.java、ServiceImpl.java生成 - */ -@Data -public class ServiceTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 类名（首字母小写） - */ - private String classNameProperty; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 是否应用缓存 - */ - private Boolean isCache; - - /** - * 是否内置删除功能 - */ - private Boolean hasDelete; - - /** - * 需要import的包 - */ - private Set importPackages; - - /** - * 主键 - */ - private List keys; - - /** - * 查询参数配置 - */ - private QueryParamsTemplate queryParams; - - /** - * 新增配置 - */ - private CreateTemplate create; - - /** - * 修改配置 - */ - private UpdateTemplate update; - - @Data - public static class Key { - - /** - * 类型 - */ - private String dataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 数据表列名 - */ - private String columnName; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 03d9530b8cd67a0965fb2ff84c9ad3905e0ddea3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/SqlTemplate.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import lombok.Data; - -/** - * 用于生成Sql - */ -@Data -public class SqlTemplate { - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类名 - */ - private String className; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 父级菜单ID - */ - private String parentMenuId; - - /** - * 菜单ID - */ - private String menuId; - - /** - * 本级菜单编号 - */ - private String menuCode; - - /** - * 本级菜单名称 - */ - private String menuName; - - /** - * 新增配置 - */ - private CreateTemplate create; - - /** - * 修改配置 - */ - private UpdateTemplate update; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 938b4c46fc590d028ad85ce1775ed0d867301eef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.lframework.xingyun.template.gen.generate.templates; - -import java.util.List; -import java.util.Set; -import lombok.Data; - -/** - * 修改功能Template - */ -@Data -public class UpdateTemplate { - - /** - * 包名 - */ - private String packageName; - - /** - * 类名 - */ - private String className; - - /** - * 模块名称 - */ - private String moduleName; - - /** - * 业务名称 - */ - private String bizName; - - /** - * 类描述 - */ - private String classDescription; - - /** - * 作者 - */ - private String author; - - /** - * 字段 - */ - private List columns; - - /** - * 需要import的包 - */ - private Set importPackages; - - /** - * 主键 - */ - private List keys; - - @Data - public static class Key { - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段名 - */ - private String columnName; - - /** - * 字段备注 - */ - private String description; - } - - @Data - public static class Column { - - /** - * 是否主键 - */ - private Boolean isKey; - - /** - * 是否必填 - */ - private Boolean required; - - /** - * 验证注解 - */ - private String validateAnno; - - /** - * 验证信息 当required == true时生效 - */ - private String validateMsg; - - /** - * 是否内置枚举 - */ - private Boolean fixEnum; - - /** - * 枚举的Code的类型 当fixEnum == true时生效 - */ - private String enumCodeType; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 前端字段类型 - */ - private String frontDataType; - - /** - * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 - */ - private String frontType; - - /** - * 显示类型 - */ - private Integer viewType; - - /** - * 字段名称 - */ - private String name; - - /** - * 字段名称（首字母大写） - */ - private String nameProperty; - - /** - * 字段名 - */ - private String columnName; - - /** - * 正则表达式 - */ - private String regularExpression; - - /** - * 字段备注 - */ - private String description; - - /** - * 是否包含状态Tag - */ - private Boolean hasAvailableTag = Boolean.FALSE; - - /** - * 是否数字类型 - */ - private Boolean isNumberType = Boolean.FALSE; - - /** - * 是否小数类型 - */ - private Boolean isDecimalType = Boolean.FALSE; - - /** - * 数据字典编号 - */ - private String dataDicCode; - - /** - * 自定义选择器ID - */ - private String customSelectorId; - - /** - * 长度 - */ - private Long len; - - /** - * 小数点位数 - */ - private Integer decimals; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 431fee380af80c9d950db596dda5dd353d0424d4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCreateColumnConfigServiceImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.dto.gen.GenCreateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenCreateColumnConfig; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.mappers.GenCreateColumnConfigMapper; -import com.lframework.xingyun.template.gen.service.GenCreateColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.vo.gen.UpdateCreateColumnConfigVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenCreateColumnConfigServiceImpl - extends BaseMpServiceImpl - implements GenCreateColumnConfigService { - - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Override - public List getByDataEntityId(String entityId) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (CollectionUtil.isEmpty(columns)) { - return CollectionUtil.emptyList(); - } - - return getBaseMapper().getByIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(String entityId, List vo) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (!CollectionUtil.isEmpty(columns)) { - getBaseMapper().deleteBatchIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - if (!CollectionUtil.isEmpty(vo)) { - int orderNo = 1; - for (UpdateCreateColumnConfigVo updateCreateColumnConfigVo : vo) { - GenCreateColumnConfig record = new GenCreateColumnConfig(); - record.setId(updateCreateColumnConfigVo.getId()); - record.setRequired(updateCreateColumnConfigVo.getRequired()); - record.setOrderNo(orderNo++); - - getBaseMapper().insert(record); - } - } - } - - @Override - public GenCreateColumnConfigDto findById(String id) { - - return getBaseMapper().findById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - getBaseMapper().deleteById(id); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4b622c2e7915860b4b51c03fa498b00c74a17b18..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListCategoryServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.xingyun.template.gen.mappers.GenCustomListCategoryMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.vo.custom.list.category.CreateGenCustomListCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.list.category.GenCustomListCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.list.category.UpdateGenCustomListCategoryVo; -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.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 GenCustomListCategoryServiceImpl extends - BaseMpServiceImpl implements - GenCustomListCategoryService { - - @Autowired - private GenCustomListService genCustomListService; - - @Cacheable(value = GenCustomListCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List queryList() { - return getBaseMapper().query(); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomListCategorySelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenCustomListCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenCustomListCategory findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenCustomListCategoryVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(GenCustomListCategory.class) - .eq(GenCustomListCategory::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenCustomListCategory.class) - .eq(GenCustomListCategory::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenCustomListCategory record = new GenCustomListCategory(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenCustomListCategoryVo vo) { - Wrapper checkWrapper = Wrappers.lambdaQuery(GenCustomListCategory.class) - .eq(GenCustomListCategory::getCode, vo.getCode()) - .ne(GenCustomListCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenCustomListCategory.class) - .eq(GenCustomListCategory::getName, vo.getName()) - .ne(GenCustomListCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenCustomListCategory record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("自定义列表分类不存在！"); - } - - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.updateById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenCustomList.class) - .eq(GenCustomList::getCategoryId, id); - if (genCustomListService.count(queryWrapper) > 0) { - throw new DefaultClientException("此分类下存在自定义列表，无法删除！"); - } - - this.removeById(id); - } - - @CacheEvict(value = GenCustomListCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1392e43710176b02185dc27860ff84841c171fab..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListDetailServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; -import com.lframework.xingyun.template.gen.mappers.GenCustomListDetailMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListDetailService; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenCustomListDetailServiceImpl extends - BaseMpServiceImpl implements - GenCustomListDetailService { - - @Override - public List getByCustomListId(String customListId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(GenCustomListDetail.class) - .eq(GenCustomListDetail::getCustomListId, customListId) - .orderByAsc(GenCustomListDetail::getOrderNo); - return this.list(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByCustomListId(String customListId) { - Wrapper deleteWrapper = Wrappers.lambdaQuery(GenCustomListDetail.class) - .eq(GenCustomListDetail::getCustomListId, customListId); - this.remove(deleteWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index dbaa7e1898f8924cd71d6492e29ed5535248d035..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListHandleColumnServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenCustomListHandleColumn; -import com.lframework.xingyun.template.gen.mappers.GenCustomListHandleColumnMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListHandleColumnService; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenCustomListHandleColumnServiceImpl extends - BaseMpServiceImpl implements - GenCustomListHandleColumnService { - - @Override - public List getByCustomListId(String customListId) { - return getBaseMapper().getByCustomListId(customListId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByCustomListId(String customListId) { - - Wrapper deleteWrapper = Wrappers - .lambdaQuery(GenCustomListHandleColumn.class) - .eq(GenCustomListHandleColumn::getCustomListId, customListId); - this.remove(deleteWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 63a1edeabf8329bc9b646b4ee5f0ae3673f98c74..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListQueryParamsServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.xingyun.template.gen.mappers.GenCustomListQueryParamsMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListQueryParamsService; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenCustomListQueryParamsServiceImpl extends - BaseMpServiceImpl implements - GenCustomListQueryParamsService { - - @Override - public List getByCustomListId(String customListId) { - Wrapper queryWrapper = Wrappers.lambdaQuery( - GenCustomListQueryParams.class).eq(GenCustomListQueryParams::getCustomListId, customListId) - .orderByAsc(GenCustomListQueryParams::getOrderNo); - return this.list(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByCustomListId(String customListId) { - Wrapper deleteWrapper = Wrappers.lambdaQuery( - GenCustomListQueryParams.class) - .eq(GenCustomListQueryParams::getCustomListId, customListId); - this.remove(deleteWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 497c32b2a41c1ee253c9f7a42854e9b0fc0fa8c2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java +++ /dev/null @@ -1,508 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -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.common.utils.ThreadUtil; -import com.lframework.xingyun.template.gen.components.custom.list.CustomListConfig; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; -import com.lframework.xingyun.template.gen.entity.GenCustomListHandleColumn; -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.xingyun.template.gen.entity.GenCustomListToolbar; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnType; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnViewType; -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.enums.GenCustomListType; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.xingyun.template.gen.events.CustomListDeleteEvent; -import com.lframework.xingyun.template.gen.mappers.GenCustomListMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListDetailService; -import com.lframework.xingyun.template.gen.service.GenCustomListHandleColumnService; -import com.lframework.xingyun.template.gen.service.GenCustomListQueryParamsService; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.service.GenCustomListToolbarService; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.vo.custom.list.CreateGenCustomListVo; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListDetailVo; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListHandleColumnVo; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListQueryParamsVo; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListToolbarVo; -import com.lframework.xingyun.template.gen.vo.custom.list.QueryGenCustomListVo; -import com.lframework.xingyun.template.gen.vo.custom.list.UpdateGenCustomListVo; -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.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.starter.web.utils.JsonUtil; -import java.io.Serializable; -import java.util.List; -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 GenCustomListServiceImpl extends - BaseMpServiceImpl implements GenCustomListService { - - @Autowired - private GenCustomListQueryParamsService genCustomListQueryParamsService; - - @Autowired - private GenCustomListDetailService genCustomListDetailService; - - @Autowired - private GenCustomListToolbarService genCustomListToolbarService; - - @Autowired - private GenCustomListHandleColumnService genCustomListHandleColumnService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QueryGenCustomListVo 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(QueryGenCustomListVo vo) { - return getBaseMapper().query(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomListSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenCustomList.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenCustomList findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenCustomListVo data) { - GenCustomList record = new GenCustomList(); - record.setId(IdUtil.getId()); - record.setName(data.getName()); - if (!StringUtil.isBlank(data.getCategoryId())) { - record.setCategoryId(data.getCategoryId()); - } - record.setListType(EnumUtil.getByCode(GenCustomListType.class, data.getListType())); - record.setQueryPrefixSql(StringUtil.isBlank(data.getQueryPrefixSql()) ? StringPool.EMPTY_STR - : data.getQueryPrefixSql()); - record.setQuerySuffixSql(StringUtil.isBlank(data.getQuerySuffixSql()) ? StringPool.EMPTY_STR - : data.getQuerySuffixSql()); - record.setSuffixSql( - StringUtil.isBlank(data.getSuffixSql()) ? StringPool.EMPTY_STR : data.getSuffixSql()); - - record.setLabelWidth(data.getLabelWidth()); - record.setHasPage(data.getHasPage()); - record.setTreeData(data.getTreeData()); - // 如果是树形列表，那么分页必须禁用 - // 如果分页没有禁用，那么一定不是树形列表 - if (record.getTreeData()) { - record.setHasPage(Boolean.FALSE); - } - - if (record.getHasPage()) { - record.setTreeData(Boolean.FALSE); - } - - record.setIdColumn(data.getIdColumn()); - record.setIdColumnRelaId(data.getIdColumnRelaId()); - - if (record.getTreeData()) { - - if (StringUtil.isBlank(data.getTreePidColumn())) { - throw new DefaultClientException("父级ID字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreePidColumnRelaId())) { - throw new DefaultClientException("父级ID字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreeNodeColumn())) { - throw new DefaultClientException("树形节点字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreeNodeColumnRelaId())) { - throw new DefaultClientException("树形节点字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreeChildrenKey())) { - throw new DefaultClientException("子节点Key值不能为空！"); - } - record.setTreePidColumn(data.getTreePidColumn()); - record.setTreePidColumnRelaId(data.getTreePidColumnRelaId()); - record.setTreeNodeColumn(data.getTreeNodeColumn()); - record.setTreeNodeColumnRelaId(data.getTreeNodeColumnRelaId()); - record.setTreeChildrenKey(data.getTreeChildrenKey()); - } - record.setAllowExport(data.getAllowExport()); - record.setDataObjId(data.getDataObjId()); - record.setAvailable(Boolean.TRUE); - record.setDescription( - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR : data.getDescription()); - - if (!CollectionUtil.isEmpty(data.getQueryParams())) { - int orderNo = 1; - for (GenCustomListQueryParamsVo queryParam : data.getQueryParams()) { - GenCustomListQueryParams genCustomListQueryParams = new GenCustomListQueryParams(); - genCustomListQueryParams.setId(IdUtil.getId()); - genCustomListQueryParams.setCustomListId(record.getId()); - genCustomListQueryParams.setRelaId(queryParam.getRelaId()); - genCustomListQueryParams.setDataEntityId(queryParam.getId()); - genCustomListQueryParams.setQueryType( - EnumUtil.getByCode(GenQueryType.class, queryParam.getQueryType())); - genCustomListQueryParams.setFrontShow(queryParam.getFrontShow()); - genCustomListQueryParams.setFormWidth(queryParam.getFormWidth()); - genCustomListQueryParams.setDefaultValue(queryParam.getDefaultValue() == null ? null - : queryParam.getDefaultValue() instanceof String ? queryParam.getDefaultValue() - .toString() : JsonUtil.toJsonString(queryParam.getDefaultValue())); - genCustomListQueryParams.setOrderNo(orderNo); - genCustomListQueryParams.setType( - EnumUtil.getByCode(GenCustomListDetailType.class, queryParam.getType())); - - genCustomListQueryParamsService.save(genCustomListQueryParams); - - orderNo++; - } - } - - int orderNo = 1; - for (GenCustomListDetailVo detail : data.getDetails()) { - GenCustomListDetail genCustomListDetail = new GenCustomListDetail(); - genCustomListDetail.setId(IdUtil.getId()); - genCustomListDetail.setCustomListId(record.getId()); - genCustomListDetail.setDataEntityId(detail.getId()); - genCustomListDetail.setRelaId(detail.getRelaId()); - genCustomListDetail.setWidthType( - EnumUtil.getByCode(GenQueryWidthType.class, detail.getWidthType())); - genCustomListDetail.setWidth(detail.getWidth()); - genCustomListDetail.setSortable(detail.getSortable()); - genCustomListDetail.setOrderNo(orderNo); - genCustomListDetail.setType( - EnumUtil.getByCode(GenCustomListDetailType.class, detail.getType())); - if (genCustomListDetail.getType() == GenCustomListDetailType.CUSTOM) { - genCustomListDetail.setDataEntityId(null); - } - if (!StringUtil.isBlank(detail.getFormatter())) { - genCustomListDetail.setFormatter(detail.getFormatter()); - } - - genCustomListDetailService.save(genCustomListDetail); - - orderNo++; - } - - if (!CollectionUtil.isEmpty(data.getToolbars())) { - orderNo = 1; - for (GenCustomListToolbarVo tb : data.getToolbars()) { - GenCustomListToolbar toolbar = new GenCustomListToolbar(); - toolbar.setId(IdUtil.getId()); - toolbar.setCustomListId(record.getId()); - toolbar.setName(tb.getName()); - toolbar.setViewType(EnumUtil.getByCode(GenCustomListBtnViewType.class, tb.getViewType())); - toolbar.setBtnType(EnumUtil.getByCode(GenCustomListBtnType.class, tb.getBtnType())); - toolbar.setBtnConfig(tb.getBtnConfig()); - if (!StringUtil.isBlank(tb.getIcon())) { - toolbar.setIcon(tb.getIcon()); - } - toolbar.setOrderNo(orderNo); - orderNo++; - - genCustomListToolbarService.save(toolbar); - } - } - - if (!CollectionUtil.isEmpty(data.getHandleColumns())) { - orderNo = 1; - for (GenCustomListHandleColumnVo hd : data.getHandleColumns()) { - GenCustomListHandleColumn handleColumn = new GenCustomListHandleColumn(); - handleColumn.setId(IdUtil.getId()); - handleColumn.setCustomListId(record.getId()); - handleColumn.setName(hd.getName()); - handleColumn - .setViewType(EnumUtil.getByCode(GenCustomListBtnViewType.class, hd.getViewType())); - handleColumn.setBtnType(EnumUtil.getByCode(GenCustomListBtnType.class, hd.getBtnType())); - handleColumn.setBtnConfig(hd.getBtnConfig()); - if (!StringUtil.isBlank(hd.getIcon())) { - handleColumn.setIcon(hd.getIcon()); - } - handleColumn.setOrderNo(orderNo); - handleColumn.setWidth(hd.getWidth()); - orderNo++; - - genCustomListHandleColumnService.save(handleColumn); - } - } - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenCustomListVo data) { - GenCustomList record = this.getById(data.getId()); - if (record == null) { - throw new DefaultClientException("自定义列表不存在！"); - } - - record.setHasPage(data.getHasPage()); - record.setTreeData(data.getTreeData()); - - // 如果是树形列表，那么分页必须禁用 - // 如果分页没有禁用，那么一定不是树形列表 - if (record.getTreeData()) { - record.setHasPage(Boolean.FALSE); - } - - if (record.getHasPage()) { - record.setTreeData(Boolean.FALSE); - } - - if (record.getTreeData()) { - - if (StringUtil.isBlank(data.getTreePidColumn())) { - throw new DefaultClientException("父级ID字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreePidColumnRelaId())) { - throw new DefaultClientException("父级ID字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreeNodeColumn())) { - throw new DefaultClientException("树形节点字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreeNodeColumnRelaId())) { - throw new DefaultClientException("树形节点字段不能为空！"); - } - - if (StringUtil.isBlank(data.getTreeChildrenKey())) { - throw new DefaultClientException("子节点Key值不能为空！"); - } - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(GenCustomList.class) - .eq(GenCustomList::getId, data.getId()).set(GenCustomList::getName, data.getName()) - .set(GenCustomList::getCategoryId, - StringUtil.isBlank(data.getCategoryId()) ? null : data.getCategoryId()) - .set(GenCustomList::getListType, - EnumUtil.getByCode(GenCustomListType.class, data.getListType())) - .set(GenCustomList::getLabelWidth, data.getLabelWidth()) - .set(GenCustomList::getHasPage, record.getHasPage()) - .set(GenCustomList::getTreeData, record.getTreeData()) - .set(GenCustomList::getIdColumn, data.getIdColumn()) - .set(GenCustomList::getIdColumnRelaId, data.getIdColumnRelaId()) - .set(GenCustomList::getTreePidColumn, record.getTreeData() ? data.getTreePidColumn() : null) - .set(GenCustomList::getTreePidColumnRelaId, - record.getTreeData() ? data.getTreePidColumnRelaId() : null) - .set(GenCustomList::getTreeNodeColumn, - record.getTreeData() ? data.getTreeNodeColumn() : null) - .set(GenCustomList::getTreeNodeColumnRelaId, - record.getTreeData() ? data.getTreeNodeColumnRelaId() : null) - .set(GenCustomList::getTreeChildrenKey, - record.getTreeData() ? data.getTreeChildrenKey() : null) - .set(GenCustomList::getQueryPrefixSql, - StringUtil.isBlank(data.getQueryPrefixSql()) ? StringPool.EMPTY_STR - : data.getQueryPrefixSql()) - .set(GenCustomList::getQuerySuffixSql, - StringUtil.isBlank(data.getQuerySuffixSql()) ? StringPool.EMPTY_STR - : data.getQuerySuffixSql()) - .set(GenCustomList::getSuffixSql, - StringUtil.isBlank(data.getSuffixSql()) ? StringPool.EMPTY_STR : data.getSuffixSql()) - .set(GenCustomList::getDescription, - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR - : data.getDescription()).set(GenCustomList::getAvailable, data.getAvailable()) - .set(GenCustomList::getAllowExport, data.getAllowExport()); - - this.update(updateWrapper); - - genCustomListDetailService.deleteByCustomListId(data.getId()); - genCustomListQueryParamsService.deleteByCustomListId(data.getId()); - - if (!CollectionUtil.isEmpty(data.getQueryParams())) { - int orderNo = 1; - for (GenCustomListQueryParamsVo queryParam : data.getQueryParams()) { - GenCustomListQueryParams genCustomListQueryParams = new GenCustomListQueryParams(); - genCustomListQueryParams.setId(IdUtil.getId()); - genCustomListQueryParams.setCustomListId(record.getId()); - genCustomListQueryParams.setRelaId(queryParam.getRelaId()); - genCustomListQueryParams.setDataEntityId(queryParam.getId()); - genCustomListQueryParams.setQueryType( - EnumUtil.getByCode(GenQueryType.class, queryParam.getQueryType())); - genCustomListQueryParams.setFrontShow(queryParam.getFrontShow()); - genCustomListQueryParams.setFormWidth(queryParam.getFormWidth()); - genCustomListQueryParams.setDefaultValue(queryParam.getDefaultValue() == null ? null - : queryParam.getDefaultValue() instanceof String ? queryParam.getDefaultValue() - .toString() : JsonUtil.toJsonString(queryParam.getDefaultValue())); - genCustomListQueryParams.setOrderNo(orderNo); - genCustomListQueryParams.setType( - EnumUtil.getByCode(GenCustomListDetailType.class, queryParam.getType())); - - genCustomListQueryParamsService.save(genCustomListQueryParams); - - orderNo++; - } - } - - int orderNo = 1; - for (GenCustomListDetailVo detail : data.getDetails()) { - GenCustomListDetail genCustomListDetail = new GenCustomListDetail(); - genCustomListDetail.setId(IdUtil.getId()); - genCustomListDetail.setCustomListId(record.getId()); - genCustomListDetail.setDataEntityId(detail.getId()); - genCustomListDetail.setRelaId(detail.getRelaId()); - genCustomListDetail.setWidthType( - EnumUtil.getByCode(GenQueryWidthType.class, detail.getWidthType())); - genCustomListDetail.setWidth(detail.getWidth()); - genCustomListDetail.setSortable(detail.getSortable()); - genCustomListDetail.setOrderNo(orderNo); - genCustomListDetail.setType( - EnumUtil.getByCode(GenCustomListDetailType.class, detail.getType())); - if (genCustomListDetail.getType() == GenCustomListDetailType.CUSTOM) { - genCustomListDetail.setDataEntityId(null); - } - genCustomListDetail.setFormatter(detail.getFormatter()); - - genCustomListDetailService.save(genCustomListDetail); - - orderNo++; - } - - genCustomListToolbarService.deleteByCustomListId(record.getId()); - - if (!CollectionUtil.isEmpty(data.getToolbars())) { - orderNo = 1; - for (GenCustomListToolbarVo tb : data.getToolbars()) { - GenCustomListToolbar toolbar = new GenCustomListToolbar(); - toolbar.setId(IdUtil.getId()); - toolbar.setCustomListId(record.getId()); - toolbar.setName(tb.getName()); - toolbar.setViewType(EnumUtil.getByCode(GenCustomListBtnViewType.class, tb.getViewType())); - toolbar.setBtnType(EnumUtil.getByCode(GenCustomListBtnType.class, tb.getBtnType())); - toolbar.setBtnConfig(tb.getBtnConfig()); - if (!StringUtil.isBlank(tb.getIcon())) { - toolbar.setIcon(tb.getIcon()); - } - toolbar.setOrderNo(orderNo); - orderNo++; - - genCustomListToolbarService.save(toolbar); - } - } - - genCustomListHandleColumnService.deleteByCustomListId(record.getId()); - - if (!CollectionUtil.isEmpty(data.getHandleColumns())) { - orderNo = 1; - for (GenCustomListHandleColumnVo hd : data.getHandleColumns()) { - GenCustomListHandleColumn handleColumn = new GenCustomListHandleColumn(); - handleColumn.setId(IdUtil.getId()); - handleColumn.setCustomListId(record.getId()); - handleColumn.setName(hd.getName()); - handleColumn - .setViewType(EnumUtil.getByCode(GenCustomListBtnViewType.class, hd.getViewType())); - handleColumn.setBtnType(EnumUtil.getByCode(GenCustomListBtnType.class, hd.getBtnType())); - handleColumn.setBtnConfig(hd.getBtnConfig()); - if (!StringUtil.isBlank(hd.getIcon())) { - handleColumn.setIcon(hd.getIcon()); - } - handleColumn.setWidth(hd.getWidth()); - handleColumn.setOrderNo(orderNo); - orderNo++; - - genCustomListHandleColumnService.save(handleColumn); - } - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void delete(String id) { - GenCustomList data = this.getById(id); - - this.removeById(id); - genCustomListDetailService.deleteByCustomListId(id); - genCustomListQueryParamsService.deleteByCustomListId(id); - - if (data != null) { - CustomListDeleteEvent event = new CustomListDeleteEvent(this); - event.setId(id); - event.setName(data.getName()); - ApplicationUtil.publishEvent(event); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomList.class) - .set(GenCustomList::getAvailable, Boolean.TRUE).eq(GenCustomList::getId, id); - getBaseMapper().update(wrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomList.class) - .set(GenCustomList::getAvailable, Boolean.FALSE).eq(GenCustomList::getId, id); - getBaseMapper().update(wrapper); - } - - @Override - public List getRelaGenDataObjIds(String objId) { - return getBaseMapper().getRelaGenDataObjIds(objId); - } - - @Override - public List getRelaGenDataEntityIds(String entityId) { - return getBaseMapper().getRelaGenDataEntityIds(entityId); - } - - @CacheEvict(value = {GenCustomList.CACHE_NAME, CustomListConfig.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - ThreadUtil.execAsync(() -> { - GenCustomSelectorService genCustomSelectorService = ApplicationUtil - .getBean(GenCustomSelectorService.class); - List ids = genCustomSelectorService.getRelaGenCustomListIds(String.valueOf(key)); - if (CollectionUtil.isNotEmpty(ids)) { - genCustomSelectorService.cleanCacheByKeys(ids); - } - }); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ee9b94e76f16ab34bf43a84cfd77045984a3bbef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListToolbarServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenCustomListToolbar; -import com.lframework.xingyun.template.gen.mappers.GenCustomListToolbarMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListToolbarService; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenCustomListToolbarServiceImpl extends - BaseMpServiceImpl implements - GenCustomListToolbarService { - - @Override - public List getByCustomListId(String customListId) { - return getBaseMapper().getByCustomListId(customListId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByCustomListId(String customListId) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery(GenCustomListToolbar.class) - .eq(GenCustomListToolbar::getCustomListId, customListId); - this.remove(deleteWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d60fd038d3c88ffca4d18020c0d23ba8fa15b772..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageCategoryServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.service.GenCustomPageCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomPageService; -import com.lframework.xingyun.template.gen.vo.custom.page.category.CreateGenCustomPageCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.page.category.UpdateGenCustomPageCategoryVo; -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.xingyun.template.gen.mappers.GenCustomPageCategoryMapper; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.IdUtil; -import java.io.Serializable; -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 GenCustomPageCategoryServiceImpl extends - BaseMpServiceImpl implements - GenCustomPageCategoryService { - - @Autowired - private GenCustomPageService genCustomPageService; - - @Cacheable(value = GenCustomPageCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List queryList() { - return getBaseMapper().query(); - } - - @Cacheable(value = GenCustomPageCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenCustomPageCategory findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenCustomPageCategoryVo vo) { - - Wrapper checkWrapper = Wrappers - .lambdaQuery(GenCustomPageCategory.class) - .eq(GenCustomPageCategory::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenCustomPageCategory.class) - .eq(GenCustomPageCategory::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenCustomPageCategory record = new GenCustomPageCategory(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - record.setParentId(StringUtil.isBlank(vo.getParentId()) ? null : vo.getParentId()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenCustomPageCategoryVo vo) { - Wrapper checkWrapper = Wrappers - .lambdaQuery(GenCustomPageCategory.class) - .eq(GenCustomPageCategory::getCode, vo.getCode()) - .ne(GenCustomPageCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenCustomPageCategory.class) - .eq(GenCustomPageCategory::getName, vo.getName()) - .ne(GenCustomPageCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenCustomPageCategory record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("自定义列表分类不存在！"); - } - - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.updateById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - Set categoryIds = new HashSet<>(); - categoryIds.add(id); - while (true) { - Wrapper queryCategoryWrapper = Wrappers.lambdaQuery( - GenCustomPageCategory.class).in(GenCustomPageCategory::getParentId, categoryIds); - List categoryList = this.list(queryCategoryWrapper); - - int oldSize = categoryIds.size(); - categoryIds.addAll( - categoryList.stream().map(GenCustomPageCategory::getId).collect(Collectors.toList())); - if (oldSize == categoryIds.size()) { - break; - } - } - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenCustomPage.class) - .in(GenCustomPage::getCategoryId, categoryIds); - if (genCustomPageService.count(queryWrapper) > 0) { - throw new DefaultClientException("此分类或其子分类下存在自定义页面，无法删除！"); - } - - this.removeByIds(categoryIds); - } - - @CacheEvict(value = GenCustomPageCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index eceaef4937b939e6a5785516239e4fe4d173a4d7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -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.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 java.io.Serializable; -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 GenCustomPageServiceImpl extends - BaseMpServiceImpl implements - GenCustomPageService { - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QueryGenCustomPageVo 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(QueryGenCustomPageVo vo) { - return getBaseMapper().query(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomPageSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenCustomPage.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenCustomPage findById(Integer id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public Integer create(CreateGenCustomPageVo data) { - GenCustomPage record = new GenCustomPage(); - - record.setName(data.getName()); - if (!StringUtil.isBlank(data.getCategoryId())) { - record.setCategoryId(data.getCategoryId()); - } - record.setPageCode(data.getPageCode()); - record.setScriptCode(data.getScriptCode()); - record.setDescription( - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR : data.getDescription()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenCustomPageVo data) { - GenCustomPage record = this.getById(data.getId()); - if (record == null) { - throw new DefaultClientException("自定义表单不存在！"); - } - - record.setPageCode(data.getPageCode()); - record.setScriptCode(data.getScriptCode()); - record.setDescription( - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR : data.getDescription()); - - this.updateAllColumnById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void delete(Integer id) { - this.removeById(id); - } - - @CacheEvict(value = {GenCustomPage.CACHE_NAME, - CustomPageConfig.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - super.cleanCacheByKey(key); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4e1ae60a08ff989f4695425f76815e9bbfbfdf2a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorCategoryServiceImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.xingyun.template.gen.mappers.GenCustomSelectorCategoryMapper; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorCategoryService; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.CreateGenCustomSelectorCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.GenCustomSelectorCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.UpdateGenCustomSelectorCategoryVo; -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.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 GenCustomSelectorCategoryServiceImpl extends - BaseMpServiceImpl implements - GenCustomSelectorCategoryService { - - @Autowired - private GenCustomSelectorService genCustomSelectorService; - - @Cacheable(value = GenCustomSelectorCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List queryList() { - return getBaseMapper().query(); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomSelectorCategorySelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenCustomSelectorCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenCustomSelectorCategory findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenCustomSelectorCategoryVo vo) { - - Wrapper checkWrapper = Wrappers - .lambdaQuery(GenCustomSelectorCategory.class) - .eq(GenCustomSelectorCategory::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenCustomSelectorCategory.class) - .eq(GenCustomSelectorCategory::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenCustomSelectorCategory record = new GenCustomSelectorCategory(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenCustomSelectorCategoryVo vo) { - Wrapper checkWrapper = Wrappers - .lambdaQuery(GenCustomSelectorCategory.class) - .eq(GenCustomSelectorCategory::getCode, vo.getCode()) - .ne(GenCustomSelectorCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenCustomSelectorCategory.class) - .eq(GenCustomSelectorCategory::getName, vo.getName()) - .ne(GenCustomSelectorCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenCustomSelectorCategory record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("自定义列表分类不存在！"); - } - - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.updateById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenCustomSelector.class) - .eq(GenCustomSelector::getCategoryId, id); - if (genCustomSelectorService.count(queryWrapper) > 0) { - throw new DefaultClientException("此分类下存在自定义选择器，无法删除！"); - } - - this.removeById(id); - } - - @CacheEvict(value = GenCustomSelectorCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e8569b48952a159aae53ebeef1cc872708323c8e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -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.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; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import com.lframework.xingyun.template.gen.vo.custom.selector.CreateGenCustomSelectorVo; -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 java.io.Serializable; -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 GenCustomSelectorServiceImpl extends - BaseMpServiceImpl implements - GenCustomSelectorService { - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QueryGenCustomSelectorVo 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(QueryGenCustomSelectorVo vo) { - return getBaseMapper().query(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomSelectorSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenCustomSelector.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenCustomSelector findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenCustomSelectorVo data) { - GenCustomSelector record = new GenCustomSelector(); - - record.setId(IdUtil.getId()); - record.setName(data.getName()); - if (!StringUtil.isBlank(data.getCategoryId())) { - record.setCategoryId(data.getCategoryId()); - } - record.setCustomListId(data.getCustomListId()); - record.setAvailable(Boolean.TRUE); - record.setDescription( - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR : data.getDescription()); - record.setIdColumn(data.getIdColumn()); - record.setIdColumnRelaId(data.getIdColumnRelaId()); - record.setNameColumn(data.getNameColumn()); - record.setNameColumnRelaId(data.getNameColumnRelaId()); - record.setDialogTittle( - StringUtil.isBlank(data.getDialogTittle()) ? StringPool.EMPTY_STR : data.getDialogTittle()); - record.setDialogWidth(data.getDialogWidth()); - record.setPlaceholder( - StringUtil.isBlank(data.getPlaceholder()) ? StringPool.EMPTY_STR : data.getPlaceholder()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenCustomSelectorVo data) { - GenCustomSelector record = this.getById(data.getId()); - if (record == null) { - throw new DefaultClientException("自定义列表不存在！"); - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(GenCustomSelector.class) - .eq(GenCustomSelector::getId, data.getId()).set(GenCustomSelector::getName, data.getName()) - .set(GenCustomSelector::getCategoryId, - StringUtil.isBlank(data.getCategoryId()) ? null : data.getCategoryId()) - .set(GenCustomSelector::getDialogTittle, - StringUtil.isBlank(data.getDialogTittle()) ? StringPool.EMPTY_STR - : data.getDialogTittle()) - .set(GenCustomSelector::getDialogWidth, data.getDialogWidth()) - .set(GenCustomSelector::getPlaceholder, - StringUtil.isBlank(data.getPlaceholder()) ? StringPool.EMPTY_STR - : data.getPlaceholder()) - .set(GenCustomSelector::getIdColumn, data.getIdColumn()) - .set(GenCustomSelector::getIdColumnRelaId, data.getIdColumnRelaId()) - .set(GenCustomSelector::getNameColumn, data.getNameColumn()) - .set(GenCustomSelector::getNameColumnRelaId, data.getNameColumnRelaId()) - .set(GenCustomSelector::getDescription, - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR - : data.getDescription()).set(GenCustomSelector::getAvailable, data.getAvailable()); - - this.update(updateWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void delete(String id) { - this.removeById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomSelector.class) - .set(GenCustomSelector::getAvailable, Boolean.TRUE).eq(GenCustomSelector::getId, id); - getBaseMapper().update(wrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomSelector.class) - .set(GenCustomSelector::getAvailable, Boolean.FALSE).eq(GenCustomSelector::getId, id); - getBaseMapper().update(wrapper); - } - - @Override - public List getRelaGenCustomListIds(String customListId) { - return getBaseMapper().getRelaGenCustomListIds(customListId); - } - - @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-sys/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 deleted file mode 100644 index c5a5f39934ea69b8cecad9f83bc26b4d3ddd1f84..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityCategoryServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.xingyun.template.gen.mappers.GenDataEntityCategoryMapper; -import com.lframework.xingyun.template.gen.service.GenDataEntityCategoryService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.vo.data.entity.category.CreateGenDataEntityCategoryVo; -import com.lframework.xingyun.template.gen.vo.data.entity.category.GenDataEntityCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.category.UpdateGenDataEntityCategoryVo; -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.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 GenDataEntityCategoryServiceImpl extends - BaseMpServiceImpl implements - GenDataEntityCategoryService { - - @Autowired - private GenDataEntityService genDataEntityService; - - @Cacheable(value = GenDataEntityCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List queryList() { - return getBaseMapper().query(); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenDataEntityCategorySelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenDataEntityCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenDataEntityCategory findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenDataEntityCategoryVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(GenDataEntityCategory.class) - .eq(GenDataEntityCategory::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenDataEntityCategory.class) - .eq(GenDataEntityCategory::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenDataEntityCategory record = new GenDataEntityCategory(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenDataEntityCategoryVo vo) { - Wrapper checkWrapper = Wrappers.lambdaQuery(GenDataEntityCategory.class) - .eq(GenDataEntityCategory::getCode, vo.getCode()) - .ne(GenDataEntityCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenDataEntityCategory.class) - .eq(GenDataEntityCategory::getName, vo.getName()) - .ne(GenDataEntityCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenDataEntityCategory record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("数据实体分类不存在！"); - } - - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.updateById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataEntity.class) - .eq(GenDataEntity::getCategoryId, id); - if (genDataEntityService.count(queryWrapper) > 0) { - throw new DefaultClientException("此分类下存在数据实体，无法删除！"); - } - - this.removeById(id); - } - - @CacheEvict(value = GenDataEntityCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 392af9a117eac6fcd8586c3ee355ff51bc389aa7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityDetailServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.mappers.GenDataEntityDetailMapper; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntityDetailSelectorVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenDataEntityDetailServiceImpl extends - BaseMpServiceImpl implements - GenDataEntityDetailService { - - @Override - public List getByEntityId(String entityId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataEntityDetail.class) - .eq(GenDataEntityDetail::getEntityId, entityId) - .orderByAsc(GenDataEntityDetail::getColumnOrder); - - return getBaseMapper().selectList(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByEntityId(String entityId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataEntityDetail.class) - .eq(GenDataEntityDetail::getEntityId, entityId); - getBaseMapper().delete(queryWrapper); - } - - @Override - public List selector(GenDataEntityDetailSelectorVo vo) { - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataEntityDetail.class) - .eq(GenDataEntityDetail::getEntityId, vo.getEntityId()) - .orderByAsc(GenDataEntityDetail::getColumnOrder); - - return getBaseMapper().selectList(queryWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c531c070049555a678e26edd2434ecca16ac58c1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java +++ /dev/null @@ -1,527 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -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.ObjectUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.converters.GenStringConverter; -import com.lframework.xingyun.template.gen.converters.GenViewTypeConverter; -import com.lframework.xingyun.template.gen.dto.data.entity.DataEntityGenerateDto; -import com.lframework.xingyun.template.gen.dto.gen.GenCreateColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenDetailColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import com.lframework.xingyun.template.gen.dto.gen.GenQueryColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenQueryParamsColumnConfigDto; -import com.lframework.xingyun.template.gen.dto.gen.GenUpdateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.xingyun.template.gen.enums.GenConvertType; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenKeyType; -import com.lframework.xingyun.template.gen.enums.GenOrderType; -import com.lframework.xingyun.template.gen.enums.GenStatus; -import com.lframework.xingyun.template.gen.enums.GenTemplateType; -import com.lframework.xingyun.template.gen.enums.GenViewType; -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.mappers.GenDataEntityMapper; -import com.lframework.xingyun.template.gen.service.GenCreateColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDataEntityService; -import com.lframework.xingyun.template.gen.service.GenDetailColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenQueryColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenQueryParamsColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenUpdateColumnConfigService; -import com.lframework.xingyun.template.gen.service.GenerateInfoService; -import com.lframework.xingyun.template.gen.service.SimpleDBService; -import com.lframework.xingyun.template.gen.vo.data.entity.CreateDataEntityVo; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntityDetailVo; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntitySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.QueryDataEntityVo; -import com.lframework.xingyun.template.gen.vo.data.entity.UpdateDataEntityGenerateVo; -import com.lframework.xingyun.template.gen.vo.data.entity.UpdateDataEntityVo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateGenerateInfoVo; -import com.lframework.xingyun.template.gen.dto.simpledb.OriSimpleTableDto; -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.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import lombok.NonNull; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenDataEntityServiceImpl extends - BaseMpServiceImpl implements GenDataEntityService { - - @Autowired - private GenerateInfoService generateInfoService; - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Autowired - private SimpleDBService simpleDBService; - - @Autowired - private GenCreateColumnConfigService genCreateColumnConfigService; - - @Autowired - private GenUpdateColumnConfigService genUpdateColumnConfigService; - - @Autowired - private GenQueryColumnConfigService genQueryColumnConfigService; - - @Autowired - private GenQueryParamsColumnConfigService genQueryParamsColumnConfigService; - - @Autowired - private GenDetailColumnConfigService genDetailColumnConfigService; - - @Autowired - private GenViewTypeConverter genViewTypeConverter; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QueryDataEntityVo 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(QueryDataEntityVo vo) { - return getBaseMapper().query(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenDataEntitySelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public GenDataEntity findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateDataEntityVo data) { - GenDataEntity record = new GenDataEntity(); - record.setId(IdUtil.getId()); - record.setName(data.getName()); - if (!StringUtil.isBlank(data.getCategoryId())) { - record.setCategoryId(data.getCategoryId()); - } - record.setAvailable(Boolean.TRUE); - record.setDescription( - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR : data.getDescription()); - - - - OriSimpleTableDto table = simpleDBService.getByTableName(data.getTableName()); - if (ObjectUtil.isNull(table)) { - throw new DefaultClientException("数据表【" + data.getTableName() + "】不存在！"); - } - - record.setTableSchema(table.getTableSchema()); - record.setTableName(table.getTableName()); - record.setEngine(table.getEngine()); - record.setTableCollation(table.getTableCollation()); - record.setTableComment(table.getTableComment()); - record.setConvertType(GenConvertType.UNDERLINE_TO_CAMEL); - - this.save(record); - - int orderNo = 1; - for (GenDataEntityDetailVo column : data.getColumns()) { - GenSimpleTableColumn columnDto = table.getColumns().stream() - .filter(t -> t.getDbColumnName().equals(column.getId())).findFirst().orElse(null); - if (columnDto == null) { - throw new DefaultClientException("字段【" + column.getId() + "】不存在！"); - } - - GenDataEntityDetail detail = this.buildDetail(column, columnDto); - detail.setId(IdUtil.getId()); - detail.setEntityId(record.getId()); - detail.setColumnOrder(orderNo); - - genDataEntityDetailService.save(detail); - - orderNo++; - } - - // 设置默认的基础设置 - UpdateGenerateInfoVo updateGenerateInfoVo = new UpdateGenerateInfoVo(); - updateGenerateInfoVo.setTemplateType(GenTemplateType.LIST.getCode()); - updateGenerateInfoVo.setPackageName("com.lframework"); - updateGenerateInfoVo.setModuleName(StringPool.EMPTY_STR); - updateGenerateInfoVo.setBizName( - GenStringConverter.convertToNormalLowerCase(GenConvertType.UNDERLINE_TO_CAMEL, - record.getTableName())); - // 强制转驼峰并且首字母大写 - String className = GenStringConverter.convertToCamelCase(GenConvertType.UNDERLINE_TO_CAMEL, - record.getTableName()); - updateGenerateInfoVo.setClassName( - className.substring(0, 1).toUpperCase() + className.substring(1)); - updateGenerateInfoVo.setClassDescription( - StringUtil.isEmpty(record.getTableComment()) ? StringPool.EMPTY_STR - : record.getTableComment()); - updateGenerateInfoVo.setKeyType(GenKeyType.SNOW_FLAKE.getCode()); - updateGenerateInfoVo.setMenuCode(StringPool.EMPTY_STR); - updateGenerateInfoVo.setMenuName(StringPool.EMPTY_STR); - updateGenerateInfoVo.setDetailSpan(4); - updateGenerateInfoVo.setIsCache(true); - updateGenerateInfoVo.setHasDelete(false); - - generateInfoService.updateGenerate(record.getId(), updateGenerateInfoVo); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateDataEntityVo vo) { - GenDataEntity record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("数据实体不存在！"); - } - Wrapper updateWrapper = Wrappers.lambdaUpdate(GenDataEntity.class) - .eq(GenDataEntity::getId, vo.getId()).set(GenDataEntity::getName, vo.getName()) - .set(GenDataEntity::getAvailable, vo.getAvailable()).set(GenDataEntity::getCategoryId, - StringUtil.isBlank(vo.getCategoryId()) ? null : vo.getCategoryId()) - .set(GenDataEntity::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - this.update(updateWrapper); - - List columnDtos = genDataEntityDetailService.getByEntityId(record.getId()); - - int orderNo = 1; - for (GenDataEntityDetailVo column : vo.getColumns()) { - GenDataEntityDetail detail = columnDtos.stream() - .filter(t -> t.getId().equals(column.getId())).findFirst().orElse(null); - detail.setName(column.getName()); - - detail.setDataType(EnumUtil.getByCode(GenDataType.class, column.getDataType())); - detail.setDescription(column.getDescription()); - detail.setViewType(EnumUtil.getByCode(GenViewType.class, column.getViewType())); - detail.setFixEnum(column.getFixEnum()); - detail.setEnumBack(column.getEnumBack()); - detail.setEnumFront(column.getEnumFront()); - detail.setRegularExpression(column.getRegularExpression()); - detail.setIsOrder(column.getIsOrder()); - detail.setOrderType(EnumUtil.getByCode(GenOrderType.class, column.getOrderType())); - detail.setLen(column.getLen()); - detail.setDecimals(column.getDecimals()); - detail.setDataDicId(StringPool.EMPTY_STR); - detail.setCustomSelectorId(StringPool.EMPTY_STR); - if (!StringUtil.isBlank(column.getDataDicId()) - && detail.getViewType() == GenViewType.DATA_DIC) { - detail.setDataDicId(column.getDataDicId()); - } - if (!StringUtil.isBlank(column.getCustomSelectorId()) - && detail.getViewType() == GenViewType.CUSTOM_SELECTOR) { - detail.setCustomSelectorId(column.getCustomSelectorId()); - } - - if (!genViewTypeConverter.canConvert(detail.getViewType(), detail.getDataType())) { - List viewTypes = genViewTypeConverter.convert(detail.getDataType()); - throw new DefaultClientException( - "字段【" + detail.getName() + "】数据类型和显示类型不匹配，当前数据类型为【" + detail.getDataType().getDesc() - + "】，" + (!CollectionUtil.isEmpty(viewTypes) ? "显示类型只能为【" + CollectionUtil.join( - genViewTypeConverter.convert(detail.getDataType()).stream() - .map(GenViewType::getDesc) - .collect(Collectors.toList()), StringPool.STR_SPLIT_CN) + "】" : "暂不支持显示此数据类型")); - } - detail.setColumnOrder(orderNo); - - genDataEntityDetailService.updateById(detail); - - orderNo++; - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void delete(@NonNull String id) { - - GenDataEntity record = getBaseMapper().selectById(id); - if (record == null) { - throw new DefaultClientException("数据实体不存在！"); - } - - List columns = genDataEntityDetailService.getByEntityId(id); - List columnIds = columns.stream().map(GenDataEntityDetail::getId) - .collect(Collectors.toList()); - - getBaseMapper().deleteById(id); - - genDataEntityDetailService.deleteByEntityId(id); - - DataEntityDeleteEvent event = new DataEntityDeleteEvent(this); - event.setId(id); - event.setName(record.getName()); - event.setColumnIds(columnIds); - - ApplicationUtil.publishEvent(event); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenDataEntity.class) - .set(GenDataEntity::getAvailable, Boolean.TRUE).eq(GenDataEntity::getId, id); - getBaseMapper().update(wrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenDataEntity.class) - .set(GenDataEntity::getAvailable, Boolean.FALSE).eq(GenDataEntity::getId, id); - getBaseMapper().update(wrapper); - } - - @Override - public DataEntityGenerateDto getGenerateById(String id) { - DataEntityGenerateDto result = new DataEntityGenerateDto(); - - List columns = genDataEntityDetailService.getByEntityId(id); - result.setColumns(columns); - - GenGenerateInfoDto generateInfo = generateInfoService.getByEntityId(id); - result.setGenerateInfo(generateInfo); - - List createColumnConfigDtos = genCreateColumnConfigService.getByDataEntityId( - id); - result.setCreateConfigs(createColumnConfigDtos); - - List updateColumnConfigDtos = genUpdateColumnConfigService.getByDataEntityId( - id); - result.setUpdateConfigs(updateColumnConfigDtos); - - List queryColumnConfigDtos = genQueryColumnConfigService.getByDataEntityId( - id); - result.setQueryConfigs(queryColumnConfigDtos); - - List queryParamsColumnConfigDtos = genQueryParamsColumnConfigService.getByDataEntityId( - id); - result.setQueryParamsConfigs(queryParamsColumnConfigDtos); - - List detailColumnConfigDtos = genDetailColumnConfigService.getByDataEntityId( - id); - result.setDetailConfigs(detailColumnConfigDtos); - - return result; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(UpdateDataEntityGenerateVo vo) { - - generateInfoService.updateGenerate(vo.getId(), vo.getGenerateInfo()); - - genCreateColumnConfigService.updateGenerate(vo.getId(), vo.getCreateConfigs()); - - genUpdateColumnConfigService.updateGenerate(vo.getId(), vo.getUpdateConfigs()); - - genQueryColumnConfigService.updateGenerate(vo.getId(), vo.getQueryConfigs()); - - genQueryParamsColumnConfigService.updateGenerate(vo.getId(), vo.getQueryParamsConfigs()); - - genDetailColumnConfigService.updateGenerate(vo.getId(), vo.getDetailConfigs()); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(GenDataEntity.class) - .set(GenDataEntity::getGenStatus, GenStatus.SET_GEN).eq(GenDataEntity::getId, vo.getId()); - getBaseMapper().update(updateWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void syncTable(String id) { - // 查询simpleTable - GenDataEntity table = this.getById(id); - if (table == null) { - throw new DefaultClientException("数据表不存在！"); - } - List columns = genDataEntityDetailService.getByEntityId(table.getId()); - - // 最新的数据库结构 - OriSimpleTableDto oriTable = simpleDBService.getByTableName(table.getTableName()); - List oriColumns = oriTable.getColumns(); - - // 1、列是否匹配 - // db中是否有新增列 - List finalColumns = columns; - List newDbColumns = oriColumns.stream().filter( - t -> finalColumns.stream().noneMatch(c -> c.getDbColumnName().equals(t.getDbColumnName()))) - .collect(Collectors.toList()); - // 类型发生变化的列 - List changeTypeColumns = oriColumns.stream().filter( - t -> finalColumns.stream().anyMatch( - c -> c.getDbColumnName().equals(t.getDbColumnName()) && c.getDbDataType() != t.getDataType())) - .collect(Collectors.toList()); - if (!CollectionUtil.isEmpty(changeTypeColumns)) { - newDbColumns.addAll(changeTypeColumns); - } - - // db中是否有删除列 - List deleteDbColumns = columns.stream().filter( - t -> oriColumns.stream().noneMatch(c -> c.getDbColumnName().equals(t.getDbColumnName())) - || changeTypeColumns.stream() - .anyMatch(c2 -> c2.getDbColumnName().equals(t.getDbColumnName()))) - .collect(Collectors.toList()); - - // 先删除、后新增 - if (!CollectionUtil.isEmpty(deleteDbColumns)) { - for (GenDataEntityDetail deleteDbColumn : deleteDbColumns) { - genDataEntityDetailService.removeById(deleteDbColumn.getId()); - // 发布删除事件 - DataEntityDetailDeleteEvent event = new DataEntityDetailDeleteEvent(this); - event.setId(deleteDbColumn.getId()); - event.setName(deleteDbColumn.getDbColumnName()); - ApplicationUtil.publishEvent(event); - } - } - - List details = genDataEntityDetailService.getByEntityId(table.getId()); - if (CollectionUtil.isEmpty(details)) { - details = new ArrayList<>(); - } - int orderNo = 1; - for (GenDataEntityDetail detail : details) { - detail.setColumnOrder(orderNo); - genDataEntityDetailService.updateById(detail); - orderNo++; - } - - table = this.getById(id); - columns = details; - - orderNo = 1; - for (GenDataEntityDetail column : columns) { - column.setOrdinalPosition(orderNo); - genDataEntityDetailService.updateById(column); - orderNo++; - } - - if (!CollectionUtil.isEmpty(newDbColumns)) { - for (GenSimpleTableColumn columnDto : newDbColumns) { - GenDataEntityDetail detail = this.buildDetail(columnDto); - detail.setId(IdUtil.getId()); - detail.setColumnOrder(orderNo); - detail.setEntityId(table.getId()); - genDataEntityDetailService.save(detail); - - orderNo++; - } - } - } - - private GenDataEntityDetail buildDetail(GenSimpleTableColumn columnDto) { - GenDataEntityDetail detail = new GenDataEntityDetail(); - - detail.setName(columnDto.getColumnComment()); - detail.setColumnName(GenStringConverter.convertToCamelCase(GenConvertType.UNDERLINE_TO_CAMEL, - columnDto.getDbColumnName())); - detail.setIsKey(columnDto.getIsKey()); - detail.setDataType(columnDto.getDataType()); - List viewTypes = genViewTypeConverter.convert(detail.getDataType()); - if (CollectionUtil.isEmpty(viewTypes)) { - throw new DefaultClientException("字段：" + columnDto.getDbColumnName() + "类型暂不支持！"); - } - detail.setViewType(viewTypes.get(0)); - detail.setFixEnum(Boolean.FALSE); - detail.setIsOrder(Boolean.FALSE); - - detail.setDbColumnName(columnDto.getDbColumnName()); - detail.setDbDataType(columnDto.getDataType()); - detail.setIsNullable(columnDto.getIsNullable()); - detail.setIsKey(columnDto.getIsKey()); - detail.setColumnDefault(columnDto.getColumnDefault()); - detail.setOrdinalPosition(columnDto.getOrdinalPosition()); - detail.setColumnComment(columnDto.getColumnComment()); - detail.setDbLen(columnDto.getLen()); - detail.setDbDecimals(columnDto.getDecimals()); - - return detail; - } - - private GenDataEntityDetail buildDetail(GenDataEntityDetailVo column, - GenSimpleTableColumn columnDto) { - GenDataEntityDetail detail = new GenDataEntityDetail(); - detail.setColumnName(GenStringConverter.convertToCamelCase(GenConvertType.UNDERLINE_TO_CAMEL, - columnDto.getDbColumnName())); - detail.setIsKey(columnDto.getIsKey()); - - detail.setName(column.getName()); - detail.setDataType(EnumUtil.getByCode(GenDataType.class, column.getDataType())); - detail.setDescription(column.getDescription()); - detail.setViewType(EnumUtil.getByCode(GenViewType.class, column.getViewType())); - detail.setFixEnum(column.getFixEnum()); - detail.setEnumBack(column.getEnumBack()); - detail.setEnumFront(column.getEnumFront()); - detail.setRegularExpression(column.getRegularExpression()); - detail.setIsOrder(column.getIsOrder()); - detail.setOrderType(EnumUtil.getByCode(GenOrderType.class, column.getOrderType())); - detail.setLen(column.getLen()); - detail.setDecimals(column.getDecimals()); - detail.setDataDicId(StringPool.EMPTY_STR); - detail.setCustomSelectorId(StringPool.EMPTY_STR); - if (!StringUtil.isBlank(column.getDataDicId()) - && detail.getViewType() == GenViewType.DATA_DIC) { - detail.setDataDicId(column.getDataDicId()); - } - if (!StringUtil.isBlank(column.getCustomSelectorId()) - && detail.getViewType() == GenViewType.CUSTOM_SELECTOR) { - detail.setCustomSelectorId(column.getCustomSelectorId()); - } - detail.setDbColumnName(columnDto.getDbColumnName()); - detail.setDbDataType(columnDto.getDataType()); - detail.setIsNullable(columnDto.getIsNullable()); - detail.setColumnDefault(columnDto.getColumnDefault()); - detail.setOrdinalPosition(columnDto.getOrdinalPosition()); - detail.setColumnComment(columnDto.getColumnComment()); - detail.setDbLen(columnDto.getLen()); - detail.setDbDecimals(columnDto.getDecimals()); - - if (!genViewTypeConverter.canConvert(detail.getViewType(), detail.getDataType())) { - List viewTypes = genViewTypeConverter.convert(detail.getDataType()); - throw new DefaultClientException( - "字段【" + detail.getName() + "】数据类型和显示类型不匹配，当前数据类型为【" + detail.getDataType().getDesc() - + "】，" + (!CollectionUtil.isEmpty(viewTypes) ? "显示类型只能为【" + CollectionUtil.join( - genViewTypeConverter.convert(detail.getDataType()).stream().map(GenViewType::getDesc) - .collect(Collectors.toList()), StringPool.STR_SPLIT_CN) + "】" : "暂不支持显示此数据类型")); - } - - return detail; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a7f25b7bea45a4c9674c4ac155d3830ea66c69d7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjCategoryServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.xingyun.template.gen.mappers.GenDataObjCategoryMapper; -import com.lframework.xingyun.template.gen.service.GenDataObjCategoryService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import com.lframework.xingyun.template.gen.vo.data.obj.category.CreateGenDataObjCategoryVo; -import com.lframework.xingyun.template.gen.vo.data.obj.category.GenDataObjCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.category.UpdateGenDataObjCategoryVo; -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.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 GenDataObjCategoryServiceImpl extends - BaseMpServiceImpl implements - GenDataObjCategoryService { - - @Autowired - private GenDataObjService genDataObjService; - - @Cacheable(value = GenDataObjCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List queryList() { - return getBaseMapper().query(); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenDataObjCategorySelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenDataObjCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenDataObjCategory findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenDataObjCategoryVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(GenDataObjCategory.class) - .eq(GenDataObjCategory::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenDataObjCategory.class) - .eq(GenDataObjCategory::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenDataObjCategory record = new GenDataObjCategory(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenDataObjCategoryVo vo) { - Wrapper checkWrapper = Wrappers.lambdaQuery(GenDataObjCategory.class) - .eq(GenDataObjCategory::getCode, vo.getCode()) - .ne(GenDataObjCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(GenDataObjCategory.class) - .eq(GenDataObjCategory::getName, vo.getName()) - .ne(GenDataObjCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - GenDataObjCategory record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("数据对象分类不存在！"); - } - - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.updateById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataObj.class) - .eq(GenDataObj::getCategoryId, id); - if (genDataObjService.count(queryWrapper) > 0) { - throw new DefaultClientException("此分类下存在数据对象，无法删除！"); - } - - this.removeById(id); - } - - @CacheEvict(value = GenDataObjCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index eebfa3c5619f897a1412d3186f932b1b7e4d341d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjDetailServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.mappers.GenDataObjDetailMapper; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenDataObjDetailServiceImpl extends - BaseMpServiceImpl implements - GenDataObjDetailService { - - @Override - public List getByObjId(String objId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataObjDetail.class) - .eq(GenDataObjDetail::getDataObjId, objId).orderByAsc(GenDataObjDetail::getOrderNo); - return this.list(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByObjId(String objId) { - Wrapper deleteWrapper = Wrappers.lambdaQuery(GenDataObjDetail.class) - .eq(GenDataObjDetail::getDataObjId, objId); - getBaseMapper().delete(deleteWrapper); - } - - @Override - public Boolean entityDetailIsRela(String entityDetailId) { - return getBaseMapper().entityDetailIsRela(entityDetailId); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index eae2e8e63da3971124169c507ab1de12f5710c15..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjQueryDetailServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.xingyun.template.gen.mappers.GenDataObjQueryDetailMapper; -import com.lframework.xingyun.template.gen.service.GenDataObjQueryDetailService; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenDataObjQueryDetailServiceImpl extends - BaseMpServiceImpl implements - GenDataObjQueryDetailService { - - @Override - public List getByObjId(String objId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataObjQueryDetail.class) - .eq(GenDataObjQueryDetail::getDataObjId, objId) - .orderByAsc(GenDataObjQueryDetail::getOrderNo); - return this.list(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByObjId(String objId) { - Wrapper deleteWrapper = Wrappers.lambdaQuery(GenDataObjQueryDetail.class) - .eq(GenDataObjQueryDetail::getDataObjId, objId); - getBaseMapper().delete(deleteWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4f13ca1743f3b12f0ecde8391e7f6e83aee5402b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java +++ /dev/null @@ -1,308 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -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.common.utils.ThreadUtil; -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryObj; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenRelaMode; -import com.lframework.xingyun.template.gen.enums.GenRelaType; -import com.lframework.xingyun.template.gen.events.DataObjDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataObjQueryDetailDeleteEvent; -import com.lframework.xingyun.template.gen.mappers.GenDataObjMapper; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjQueryDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import com.lframework.xingyun.template.gen.vo.data.obj.CreateGenDataObjVo; -import com.lframework.xingyun.template.gen.vo.data.obj.GenDataObjDetailVo; -import com.lframework.xingyun.template.gen.vo.data.obj.GenDataObjQueryDetailVo; -import com.lframework.xingyun.template.gen.vo.data.obj.GenDataObjSelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.QueryGenDataObjVo; -import com.lframework.xingyun.template.gen.vo.data.obj.UpdateGenDataObjVo; -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.ApplicationUtil; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -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.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenDataObjServiceImpl extends - BaseMpServiceImpl implements GenDataObjService { - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Autowired - private GenDataObjQueryDetailService genDataObjQueryDetailService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryGenDataObjVo 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(QueryGenDataObjVo vo) { - return getBaseMapper().query(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - GenDataObjSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = GenDataObj.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public GenDataObj findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateGenDataObjVo data) { - - GenDataObj record = new GenDataObj(); - record.setId(IdUtil.getId()); - record.setName(data.getName()); - if (!StringUtil.isBlank(data.getCategoryId())) { - record.setCategoryId(data.getCategoryId()); - } - record.setMainTableId(data.getMainTableId()); - record.setMainTableAlias(data.getMainTableAlias()); - record.setAvailable(Boolean.TRUE); - record.setDescription( - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR : data.getDescription()); - - this.save(record); - - int orderNo = 1; - if (!CollectionUtil.isEmpty(data.getColumns())) { - for (GenDataObjDetailVo column : data.getColumns()) { - GenDataObjDetail detail = new GenDataObjDetail(); - detail.setId(IdUtil.getId()); - detail.setDataObjId(record.getId()); - detail.setMainTableDetailIds( - CollectionUtil.join(column.getMainTableDetailIds(), StringPool.STR_SPLIT)); - detail.setRelaType(EnumUtil.getByCode(GenRelaType.class, column.getRelaType())); - detail.setRelaMode(EnumUtil.getByCode(GenRelaMode.class, column.getRelaMode())); - detail.setSubTableId(column.getSubTableId()); - detail.setSubTableAlias(column.getSubTableAlias()); - detail.setSubTableDetailIds( - CollectionUtil.join(column.getSubTableDetailIds(), StringPool.STR_SPLIT)); - detail.setOrderNo(orderNo); - - genDataObjDetailService.save(detail); - - orderNo++; - } - } - - if (!CollectionUtil.isEmpty(data.getQueryColumns())) { - orderNo = 1; - for (GenDataObjQueryDetailVo queryColumn : data.getQueryColumns()) { - GenDataObjQueryDetail detail = new GenDataObjQueryDetail(); - detail.setId(IdUtil.getId()); - detail.setDataObjId(record.getId()); - detail.setCustomName(queryColumn.getCustomName()); - detail.setCustomSql(queryColumn.getCustomSql()); - detail.setCustomAlias(queryColumn.getCustomAlias()); - detail.setDataType(EnumUtil.getByCode(GenDataType.class, queryColumn.getDataType())); - detail.setOrderNo(orderNo); - - genDataObjQueryDetailService.save(detail); - - orderNo++; - } - } - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateGenDataObjVo data) { - - GenDataObj record = this.getById(data.getId()); - if (record == null) { - throw new DefaultClientException("数据对象不存在！"); - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(GenDataObj.class) - .eq(GenDataObj::getId, record.getId()).set(GenDataObj::getName, data.getName()) - .set(GenDataObj::getMainTableAlias, data.getMainTableAlias()).set(GenDataObj::getCategoryId, - StringUtil.isBlank(data.getCategoryId()) ? null : data.getCategoryId()) - .set(GenDataObj::getDescription, - StringUtil.isBlank(data.getDescription()) ? StringPool.EMPTY_STR - : data.getDescription()).set(GenDataObj::getAvailable, data.getAvailable()); - this.update(updateWrapper); - - List queryDetails = genDataObjQueryDetailService.getByObjId( - record.getId()); - - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(GenDataObjDetail.class) - .eq(GenDataObjDetail::getDataObjId, record.getId()); - genDataObjDetailService.remove(deleteDetailWrapper); - - Wrapper deleteQueryDetailWrapper = Wrappers.lambdaQuery( - GenDataObjQueryDetail.class).eq(GenDataObjQueryDetail::getDataObjId, record.getId()); - genDataObjQueryDetailService.remove(deleteQueryDetailWrapper); - - int orderNo = 1; - if (!CollectionUtil.isEmpty(data.getColumns())) { - for (GenDataObjDetailVo column : data.getColumns()) { - GenDataObjDetail detail = new GenDataObjDetail(); - detail.setId(column.getId()); - detail.setDataObjId(record.getId()); - detail.setMainTableDetailIds( - CollectionUtil.join(column.getMainTableDetailIds(), StringPool.STR_SPLIT)); - detail.setRelaType(EnumUtil.getByCode(GenRelaType.class, column.getRelaType())); - detail.setRelaMode(EnumUtil.getByCode(GenRelaMode.class, column.getRelaMode())); - detail.setSubTableId(column.getSubTableId()); - detail.setSubTableAlias(column.getSubTableAlias()); - detail.setSubTableDetailIds( - CollectionUtil.join(column.getSubTableDetailIds(), StringPool.STR_SPLIT)); - detail.setOrderNo(orderNo); - - genDataObjDetailService.save(detail); - - orderNo++; - } - } - - List newQueryDetailIds = new ArrayList<>(); - if (!CollectionUtil.isEmpty(data.getQueryColumns())) { - orderNo = 1; - for (GenDataObjQueryDetailVo queryColumn : data.getQueryColumns()) { - GenDataObjQueryDetail detail = new GenDataObjQueryDetail(); - detail.setId(queryColumn.getId()); - detail.setDataObjId(record.getId()); - detail.setCustomName(queryColumn.getCustomName()); - detail.setCustomSql(queryColumn.getCustomSql()); - detail.setCustomAlias(queryColumn.getCustomAlias()); - detail.setDataType(EnumUtil.getByCode(GenDataType.class, queryColumn.getDataType())); - detail.setOrderNo(orderNo); - - genDataObjQueryDetailService.save(detail); - - orderNo++; - - newQueryDetailIds.add(detail.getId()); - } - } - - List deleteQueryDetailIds = queryDetails.stream().map(GenDataObjQueryDetail::getId) - .filter(t -> !newQueryDetailIds.contains(t)).collect( - Collectors.toList()); - - if (!CollectionUtil.isEmpty(deleteQueryDetailIds)) { - for (String deleteDetailId : deleteQueryDetailIds) { - DataObjQueryDetailDeleteEvent event = new DataObjQueryDetailDeleteEvent(this); - event.setId(deleteDetailId); - event.setName( - queryDetails.stream().filter(t -> t.getId().equals(deleteDetailId)).findFirst().get() - .getCustomName()); - - ApplicationUtil.publishEvent(event); - } - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void delete(@NonNull String id) { - GenDataObj record = this.getById(id); - if (record == null) { - return; - } - - List details = genDataObjDetailService.getByObjId(id); - List queryDetails = genDataObjQueryDetailService.getByObjId(id); - - getBaseMapper().deleteById(id); - - genDataObjDetailService.deleteByObjId(id); - - genDataObjQueryDetailService.deleteByObjId(id); - - DataObjDeleteEvent event = new DataObjDeleteEvent(this); - event.setId(id); - event.setName(record.getName()); - event.setDetailIds(details.stream().map(GenDataObjDetail::getId).collect(Collectors.toList())); - event.setQueryDetailIds(queryDetails.stream().map(GenDataObjQueryDetail::getId).collect( - Collectors.toList())); - - ApplicationUtil.publishEvent(event); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenDataObj.class) - .set(GenDataObj::getAvailable, Boolean.TRUE).eq(GenDataObj::getId, id); - getBaseMapper().update(wrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - Wrapper wrapper = Wrappers.lambdaUpdate(GenDataObj.class) - .set(GenDataObj::getAvailable, Boolean.FALSE).eq(GenDataObj::getId, id); - getBaseMapper().update(wrapper); - } - - @Override - public List getRelaGenDataEntityIds(String entityId) { - return getBaseMapper().getRelaGenDataEntityIds(entityId); - } - - @CacheEvict(value = {GenDataObj.CACHE_NAME, DataObjectQueryObj.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - - ThreadUtil.execAsync(() -> { - GenCustomListService genCustomListService = ApplicationUtil.getBean(GenCustomListService.class); - List ids = genCustomListService.getRelaGenDataObjIds(String.valueOf(key)); - if (CollectionUtil.isNotEmpty(ids)) { - genCustomListService.cleanCacheByKeys(ids); - } - }); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 49e92fef2cdf7f6c97e87bd786c907892d9911a5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDetailColumnConfigServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.dto.gen.GenDetailColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenDetailColumnConfig; -import com.lframework.xingyun.template.gen.mappers.GenDetailColumnConfigMapper; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenDetailColumnConfigService; -import com.lframework.xingyun.template.gen.vo.gen.UpdateDetailColumnConfigVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenDetailColumnConfigServiceImpl - extends BaseMpServiceImpl - implements GenDetailColumnConfigService { - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Override - public List getByDataEntityId(String entityId) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (CollectionUtil.isEmpty(columns)) { - return CollectionUtil.emptyList(); - } - - return getBaseMapper().getByIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(String entityId, List vo) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (!CollectionUtil.isEmpty(columns)) { - getBaseMapper().deleteBatchIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - if (!CollectionUtil.isEmpty(vo)) { - int orderNo = 1; - for (UpdateDetailColumnConfigVo updateDetailColumnConfigVo : vo) { - GenDetailColumnConfig record = new GenDetailColumnConfig(); - record.setId(updateDetailColumnConfigVo.getId()); - record.setSpan(updateDetailColumnConfigVo.getSpan()); - record.setOrderNo(orderNo++); - - getBaseMapper().insert(record); - } - } - } - - @Override - public GenDetailColumnConfigDto findById(String id) { - - return getBaseMapper().findById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - getBaseMapper().deleteById(id); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3701ee76c609729db47e7f5640e86fc2ad519cbd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryColumnConfigServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.dto.gen.GenQueryColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenQueryColumnConfig; -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.xingyun.template.gen.mappers.GenQueryColumnConfigMapper; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenQueryColumnConfigService; -import com.lframework.xingyun.template.gen.vo.gen.UpdateQueryColumnConfigVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.EnumUtil; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenQueryColumnConfigServiceImpl extends - BaseMpServiceImpl - implements GenQueryColumnConfigService { - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Override - public List getByDataEntityId(String entityId) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (CollectionUtil.isEmpty(columns)) { - return CollectionUtil.emptyList(); - } - - return getBaseMapper().getByIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(String entityId, List vo) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (!CollectionUtil.isEmpty(columns)) { - getBaseMapper().deleteBatchIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - if (!CollectionUtil.isEmpty(vo)) { - int orderNo = 1; - for (UpdateQueryColumnConfigVo updateQueryColumnConfigVo : vo) { - GenQueryColumnConfig record = new GenQueryColumnConfig(); - record.setId(updateQueryColumnConfigVo.getId()); - record.setWidthType( - EnumUtil.getByCode(GenQueryWidthType.class, updateQueryColumnConfigVo.getWidthType())); - record.setWidth(updateQueryColumnConfigVo.getWidth()); - record.setSortable(updateQueryColumnConfigVo.getSortable()); - record.setOrderNo(orderNo++); - - getBaseMapper().insert(record); - } - } - } - - @Override - public GenQueryColumnConfigDto findById(String id) { - - return getBaseMapper().findById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - getBaseMapper().deleteById(id); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9bd4593a3c03db8fee083e85b2e231d0da4c0ccb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryParamsColumnConfigServiceImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.dto.gen.GenQueryParamsColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenQueryParamsColumnConfig; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.xingyun.template.gen.mappers.GenQueryParamsColumnConfigMapper; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenQueryParamsColumnConfigService; -import com.lframework.xingyun.template.gen.vo.gen.UpdateQueryParamsColumnConfigVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.EnumUtil; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenQueryParamsColumnConfigServiceImpl - extends BaseMpServiceImpl - implements GenQueryParamsColumnConfigService { - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Override - public List getByDataEntityId(String entityId) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (CollectionUtil.isEmpty(columns)) { - return CollectionUtil.emptyList(); - } - - return getBaseMapper().getByIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(String entityId, List vo) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (!CollectionUtil.isEmpty(columns)) { - getBaseMapper().deleteBatchIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - if (!CollectionUtil.isEmpty(vo)) { - int orderNo = 1; - for (UpdateQueryParamsColumnConfigVo updateQueryParamsColumnConfigVo : vo) { - GenQueryParamsColumnConfig record = new GenQueryParamsColumnConfig(); - record.setId(updateQueryParamsColumnConfigVo.getId()); - record.setQueryType( - EnumUtil.getByCode(GenQueryType.class, updateQueryParamsColumnConfigVo.getQueryType())); - record.setOrderNo(orderNo++); - - getBaseMapper().insert(record); - } - } - } - - @Override - public GenQueryParamsColumnConfigDto findById(String id) { - - return getBaseMapper().findById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - getBaseMapper().deleteById(id); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 975d9a69e9ac3cd18c1f21ef1923d5b0a440e7e3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenUpdateColumnConfigServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.gen.dto.gen.GenUpdateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.entity.GenUpdateColumnConfig; -import com.lframework.xingyun.template.gen.mappers.GenUpdateColumnConfigMapper; -import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; -import com.lframework.xingyun.template.gen.service.GenUpdateColumnConfigService; -import com.lframework.xingyun.template.gen.vo.gen.UpdateUpdateColumnConfigVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenUpdateColumnConfigServiceImpl - extends BaseMpServiceImpl - implements GenUpdateColumnConfigService { - - @Autowired - private GenDataEntityDetailService genDataEntityDetailService; - - @Override - public List getByDataEntityId(String entityId) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (CollectionUtil.isEmpty(columns)) { - return CollectionUtil.emptyList(); - } - - return getBaseMapper().getByIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(String entityId, List vo) { - - List columns = genDataEntityDetailService.getByEntityId(entityId); - if (!CollectionUtil.isEmpty(columns)) { - getBaseMapper().deleteBatchIds( - columns.stream().map(GenDataEntityDetail::getId).collect(Collectors.toList())); - } - - if (!CollectionUtil.isEmpty(vo)) { - int orderNo = 1; - for (UpdateUpdateColumnConfigVo updateUpdateColumnConfigVo : vo) { - GenUpdateColumnConfig record = new GenUpdateColumnConfig(); - record.setId(updateUpdateColumnConfigVo.getId()); - record.setRequired(updateUpdateColumnConfigVo.getRequired()); - record.setOrderNo(orderNo++); - - getBaseMapper().insert(record); - } - } - } - - @Override - public GenUpdateColumnConfigDto findById(String id) { - - return getBaseMapper().findById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - getBaseMapper().deleteById(id); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2a0c56c352fd15a80727d0afa749881e02a5efdd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenerateInfoServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import com.lframework.xingyun.template.gen.entity.GenGenerateInfo; -import com.lframework.xingyun.template.gen.enums.GenKeyType; -import com.lframework.xingyun.template.gen.enums.GenTemplateType; -import com.lframework.xingyun.template.gen.mappers.GenGenerateInfoMapper; -import com.lframework.xingyun.template.gen.service.GenerateInfoService; -import com.lframework.xingyun.template.gen.vo.gen.UpdateGenerateInfoVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.EnumUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class GenerateInfoServiceImpl extends - BaseMpServiceImpl - implements GenerateInfoService { - - @Override - public GenGenerateInfoDto getByEntityId(String entityId) { - - return getBaseMapper().getByDataObjId(entityId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateGenerate(String dataObjId, UpdateGenerateInfoVo vo) { - - GenGenerateInfo data = getBaseMapper().selectById(dataObjId); - if (data != null) { - getBaseMapper().deleteById(data.getId()); - } else { - data = new GenGenerateInfo(); - } - data.setId(dataObjId); - data.setTemplateType(EnumUtil.getByCode(GenTemplateType.class, vo.getTemplateType())); - data.setPackageName(vo.getPackageName()); - data.setModuleName(vo.getModuleName()); - data.setBizName(vo.getBizName()); - data.setClassName(vo.getClassName()); - data.setClassDescription(vo.getClassDescription()); - if (!StringUtil.isBlank(vo.getParentMenuId())) { - data.setParentMenuId(vo.getParentMenuId()); - } - data.setKeyType(EnumUtil.getByCode(GenKeyType.class, vo.getKeyType())); - - if (!StringUtil.isBlank(vo.getAuthor())) { - data.setAuthor(vo.getAuthor()); - } - data.setMenuCode(vo.getMenuCode()); - data.setMenuName(vo.getMenuName()); - data.setDetailSpan(vo.getDetailSpan()); - data.setIsCache(vo.getIsCache()); - data.setHasDelete(vo.getHasDelete()); - - getBaseMapper().insert(data); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByEntityId(String entityId) { - - getBaseMapper().deleteById(entityId); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7f2b4ae6e05c4bf9ecbb701224bb59b87262a4c7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleDBServiceImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.ObjectUtil; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.xingyun.template.gen.mappers.DBMapper; -import com.lframework.xingyun.template.gen.mappers.SimpleDBMapper; -import com.lframework.xingyun.template.gen.service.SimpleDBService; -import com.lframework.xingyun.template.gen.service.SimpleTableColumnService; -import com.lframework.xingyun.template.gen.vo.simpledb.QuerySimpleTableColumnVo; -import com.lframework.xingyun.template.gen.vo.simpledb.SimpleTableSelectorVo; -import com.lframework.xingyun.template.gen.dto.simpledb.OriSimpleTableDto; -import com.lframework.xingyun.template.gen.dto.simpledb.SimpleDBDto; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class SimpleDBServiceImpl implements SimpleDBService { - - @Autowired - private SimpleDBMapper simpleDBMapper; - - @Autowired - private DBMapper dbMapper; - - @Autowired - private SimpleTableColumnService simpleTableColumnService; - - @Override - public String getCurrentDBName() { - return dbMapper.getCurrentDBName(); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - SimpleTableSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = simpleDBMapper.selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public OriSimpleTableDto getByTableName(String tableName) { - OriSimpleTableDto table = simpleDBMapper.getByTableName(tableName); - if (ObjectUtil.isNull(table)) { - return table; - } - - QuerySimpleTableColumnVo queryVo = new QuerySimpleTableColumnVo(); - queryVo.setTableName(tableName); - - List columns = simpleTableColumnService.query(queryVo); - table.setColumns(columns); - - return table; - } - - @Override - public List listByIds(List tableNames) { - return simpleDBMapper.listByIds(tableNames); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index af9876de06c01f9fb5bb172be887efab90ba8afc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleTableColumnServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lframework.xingyun.template.gen.impl; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.xingyun.template.gen.mappers.GenSimpleTableColumnMapper; -import com.lframework.xingyun.template.gen.service.SimpleDBService; -import com.lframework.xingyun.template.gen.service.SimpleTableColumnService; -import com.lframework.xingyun.template.gen.vo.simpledb.QuerySimpleTableColumnVo; -import com.lframework.xingyun.template.gen.dto.simpledb.OriSimpleTableColumnDto; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.IdUtil; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class SimpleTableColumnServiceImpl extends - BaseMpServiceImpl - implements SimpleTableColumnService { - - @Autowired - private SimpleDBService simpleDBService; - - @Override - public List query(QuerySimpleTableColumnVo vo) { - if (StringUtil.isBlank(vo.getTableSchema())) { - vo.setTableSchema(simpleDBService.getCurrentDBName()); - } - List columns = getBaseMapper().query(vo); - if (!CollectionUtil.isEmpty(columns)) { - - return columns.stream().map(t -> { - GenSimpleTableColumn column = new GenSimpleTableColumn(); - column.setId(IdUtil.getId()); - column.setColumnName(t.getColumnName()); - column.setIsNullable(t.getIsNullable()); - column.setIsKey(t.getIsKey()); - column.setColumnDefault(t.getColumnDefault()); - column.setOrdinalPosition(t.getOrdinalPosition()); - column.setColumnComment(t.getColumnComment()); - column.setDataType(t.getDataType().getDataType()); - column.setLen(t.getLen()); - column.setDecimals(t.getDecimals()); - - return column; - }).collect(Collectors.toList()); - } - - return null; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7dfaab31bedcbf0da52fd9ff9ea047e242ccae20..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/CreateColumnConfigListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenCreateColumnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class CreateColumnConfigListener { - - @Component - public static class DeleteEntityListener implements ApplicationListener { - - @Autowired - private GenCreateColumnConfigService genCreateColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - for (String columnId : event.getColumnIds()) { - genCreateColumnConfigService.deleteById(columnId); - } - } - } - - @Component - public static class DeleteEntityDetailListener implements - ApplicationListener { - - @Autowired - private GenCreateColumnConfigService genCreateColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - - genCreateColumnConfigService.deleteById(event.getId()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 56ac627c87740ad79e975a79316e3bb4bc9a1fd2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/DetailColumnConfigListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenDetailColumnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class DetailColumnConfigListener { - - @Component - public static class DeleteEntityListener implements ApplicationListener { - - @Autowired - private GenDetailColumnConfigService genDetailColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - for (String columnId : event.getColumnIds()) { - genDetailColumnConfigService.deleteById(columnId); - } - } - } - - @Component - public static class DeleteEntityDetailListener implements - ApplicationListener { - - @Autowired - private GenDetailColumnConfigService genDetailColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - - genDetailColumnConfigService.deleteById(event.getId()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ff5be83e87a84d05051a7fd3638860eeb254cccd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomListListener.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataObjDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataObjQueryDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenCustomListDetailService; -import com.lframework.xingyun.template.gen.service.GenCustomListQueryParamsService; -import com.lframework.xingyun.template.gen.service.GenCustomListService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class GenCustomListListener { - - @Component - public static class DataObjDeleteListener implements ApplicationListener { - - @Autowired - private GenCustomListService genCustomListService; - - @Override - public void onApplicationEvent(DataObjDeleteEvent event) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenCustomList.class) - .eq(GenCustomList::getDataObjId, event.getId()); - if (genCustomListService.count(queryWrapper) > 0) { - throw new DefaultClientException("数据对象【" + event.getName() + "】已关联自定义列表，无法删除！"); - } - } - } - - @Component - public static class DataEntityDetailDeleteListener implements - ApplicationListener { - - @Autowired - private GenCustomListDetailService genCustomListDetailService; - - @Autowired - private GenCustomListQueryParamsService genCustomListQueryParamsService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - - Wrapper queryDetailWrapper = Wrappers.lambdaQuery( - GenCustomListDetail.class).eq(GenCustomListDetail::getDataEntityId, event.getId()); - if (genCustomListDetailService.count(queryDetailWrapper) > 0) { - throw new DefaultClientException("字段【" + event.getName() + "】已关联自定义列表，无法删除！"); - } - - Wrapper queryQueryDetailWrapper = Wrappers.lambdaQuery( - GenCustomListQueryParams.class).eq(GenCustomListQueryParams::getRelaId, event.getId()); - if (genCustomListQueryParamsService.count(queryQueryDetailWrapper) > 0) { - throw new DefaultClientException("字段【" + event.getName() + "】已关联自定义列表，无法删除！"); - } - } - } - - @Component - public static class DataObjQueryDetailDeleteListener implements - ApplicationListener { - - @Autowired - private GenCustomListDetailService genCustomListDetailService; - - @Autowired - private GenCustomListQueryParamsService genCustomListQueryParamsService; - - @Override - public void onApplicationEvent(DataObjQueryDetailDeleteEvent event) { - Wrapper queryDetailWrapper = Wrappers.lambdaQuery( - GenCustomListDetail.class).eq(GenCustomListDetail::getDataEntityId, event.getId()); - if (genCustomListDetailService.count(queryDetailWrapper) > 0) { - throw new DefaultClientException("字段【" + event.getName() + "】已关联自定义列表，无法删除！"); - } - - Wrapper queryQueryDetailWrapper = Wrappers.lambdaQuery( - GenCustomListQueryParams.class).eq(GenCustomListQueryParams::getRelaId, event.getId()); - if (genCustomListQueryParamsService.count(queryQueryDetailWrapper) > 0) { - throw new DefaultClientException("字段【" + event.getName() + "】已关联自定义列表，无法删除！"); - } - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bfcd1a1ff38687371f35c8ff8c534e8e6c09bc5b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomSelectorListener.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.events.CustomListDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class GenCustomSelectorListener { - - @Component - public static class CustomListDeleteListener implements - ApplicationListener { - - @Autowired - private GenCustomSelectorService genCustomSelectorService; - - @Override - public void onApplicationEvent(CustomListDeleteEvent event) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenCustomSelector.class) - .eq(GenCustomSelector::getCustomListId, event.getId()); - if (genCustomSelectorService.count(queryWrapper) > 0) { - throw new DefaultClientException("自定义列表【" + event.getName() + "】已关联自定义选择器，无法删除！"); - } - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 20f5913a225f973607c885590a6fa8428b124e10..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenDataObjListener.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; -import com.lframework.xingyun.template.gen.service.GenDataObjService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class GenDataObjListener { - - @Component - public static class DataEntityDeleteListener implements - ApplicationListener { - - @Autowired - private GenDataObjService genDataObjService; - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(GenDataObj.class) - .eq(GenDataObj::getMainTableId, event.getId()); - if (genDataObjService.count(queryWrapper) > 0) { - throw new DefaultClientException("数据实体【" + event.getName() + "】已关联数据对象，无法删除！"); - } - - Wrapper queryDetailWrapper = Wrappers.lambdaQuery(GenDataObjDetail.class) - .eq(GenDataObjDetail::getSubTableId, event.getId()); - if (genDataObjDetailService.count(queryDetailWrapper) > 0) { - throw new DefaultClientException("数据实体【" + event.getName() + "】已关联数据对象，无法删除！"); - } - } - } - - @Component - public static class DataEntityDetailDeleteListener implements - ApplicationListener { - - @Autowired - private GenDataObjDetailService genDataObjDetailService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - if (genDataObjDetailService.entityDetailIsRela(event.getId())) { - throw new DefaultClientException("字段【" + event.getName() + "】已关联数据对象，无法删除！"); - } - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 82fc0149a4e6a08fae0915d6c5c86acdf3c372a3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java +++ /dev/null @@ -1,39 +0,0 @@ -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.event.ReloadTenantEvent; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.core.Ordered; -import org.springframework.stereotype.Component; -import org.ssssssss.magicapi.datasource.model.MagicDynamicDataSource; - -public class GenTenantListener { - - @Component - public static class ReloadTenantListener implements ApplicationListener, - Ordered { - - @Autowired - private MagicDynamicDataSource magicDynamicDataSource; - - @Autowired - private DynamicDataSourceProperties dynamicDataSourceProperties; - - @Override - public void onApplicationEvent(ReloadTenantEvent event) { - DataSourceProperty dataSourceProperty = dynamicDataSourceProperties.getDatasource() - .get("master"); - magicDynamicDataSource.add(String.valueOf(event.getTenantId()), - DataSourceUtil.createDataSource(dataSourceProperty, event.getJdbcUrl(), - event.getJdbcUsername(), event.getJdbcPassword(), event.getDriver())); - } - - @Override - public int getOrder() { - return Integer.MAX_VALUE; - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 25ab06533990bc8acee18c49f6e46c92aa342127..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenerateInfoListener.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenerateInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class GenerateInfoListener { - - @Component - public static class DeleteEntityListener implements ApplicationListener { - - @Autowired - private GenerateInfoService generateInfoService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - generateInfoService.deleteByEntityId(event.getId()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e4814abd7ad626d0acbe31c5aecadb166a796854..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryColumnConfigListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenQueryColumnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class QueryColumnConfigListener { - - @Component - public static class DeleteEntityListener implements ApplicationListener { - - @Autowired - private GenQueryColumnConfigService genQueryColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - for (String columnId : event.getColumnIds()) { - genQueryColumnConfigService.deleteById(columnId); - } - } - } - - @Component - public static class DeleteEntityDetailListener implements - ApplicationListener { - - @Autowired - private GenQueryColumnConfigService genQueryColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - - genQueryColumnConfigService.deleteById(event.getId()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 04c7e60510fabfcd3d63a1db4ba8071a36dd96a7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryParamsColumnConfigListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenQueryParamsColumnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class QueryParamsColumnConfigListener { - - @Component - public static class DeleteEntityListener implements ApplicationListener { - - @Autowired - private GenQueryParamsColumnConfigService genQueryParamsColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - for (String columnId : event.getColumnIds()) { - genQueryParamsColumnConfigService.deleteById(columnId); - } - } - } - - @Component - public static class DeleteEntityDetailListener implements - ApplicationListener { - - @Autowired - private GenQueryParamsColumnConfigService genQueryParamsColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - - genQueryParamsColumnConfigService.deleteById(event.getId()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ceb130d604293d3547f628de7f40409f93a6a582..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/UpdateColumnConfigListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.listeners; - -import com.lframework.xingyun.template.gen.events.DataEntityDeleteEvent; -import com.lframework.xingyun.template.gen.events.DataEntityDetailDeleteEvent; -import com.lframework.xingyun.template.gen.service.GenUpdateColumnConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -public class UpdateColumnConfigListener { - - @Component - public static class DeleteEntityListener implements ApplicationListener { - - @Autowired - private GenUpdateColumnConfigService genUpdateColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDeleteEvent event) { - - for (String columnId : event.getColumnIds()) { - genUpdateColumnConfigService.deleteById(columnId); - } - } - } - - @Component - public static class DeleteEntityDetailListener implements - ApplicationListener { - - @Autowired - private GenUpdateColumnConfigService genUpdateColumnConfigService; - - @Override - public void onApplicationEvent(DataEntityDetailDeleteEvent event) { - - genUpdateColumnConfigService.deleteById(event.getId()); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index dd802223a2e800c155841f6faf5c920af1f55ad7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/DBMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; - -public interface DBMapper extends BaseMapper { - - /** - * 查询当前数据库名称 - * - * @return - */ - String getCurrentDBName(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e9ba07a21327e9a4ed2afee2cc0d88bf525b02e7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCreateColumnConfigMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.gen.dto.gen.GenCreateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenCreateColumnConfig; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-12-10 - */ -public interface GenCreateColumnConfigMapper extends BaseMapper { - - /** - * 根据数据对象ID查询 - * - * @param ids - * @return - */ - List getByIds(@Param("ids") List ids); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCreateColumnConfigDto findById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1a6afd6e36c62bb8650d8fa8c9766d91e2094d48..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListCategoryMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.vo.custom.list.category.GenCustomListCategorySelectorVo; -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 自定义列表分类 Mapper 接口 - *

- * - * @author zmj - */ -public interface GenCustomListCategoryMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - List query(); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenCustomListCategorySelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9b620311a050381d3ca5775b7457c3bcd18f3195..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListDetailMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; -import com.lframework.starter.web.mapper.BaseMapper; - -public interface GenCustomListDetailMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e3ed9f8b2bacc67615d7e2820a465338905460e6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListHandleColumnMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenCustomListHandleColumn; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface GenCustomListHandleColumnMapper extends BaseMapper { - - /** - * 根据自定义列表ID查询 - * - * @param customListId - * @return - */ - List getByCustomListId(@Param("customListId") String customListId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 54ab1d849d7a374d8bec50b48a8b73b81e52c4bc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.list.QueryGenCustomListVo; -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 自定义列表 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenCustomListMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryGenCustomListVo vo); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenCustomListSelectorVo vo); - - /** - * 查询所有关联了数据对象的自定义列表ID - * - * @param objId - * @return - */ - List getRelaGenDataObjIds(@Param("objId") String objId); - - /** - * 查询所有关联了数据实体的自定义列表ID - * - * @param entityId - * @return - */ - List getRelaGenDataEntityIds(@Param("entityId") String entityId); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b0e9a68f290ba05e3a0b870e2cc0ca94219bf213..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListQueryParamsMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.starter.web.mapper.BaseMapper; - -public interface GenCustomListQueryParamsMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index baaed27a3266d1add07f5c55043bb952aae96ae4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListToolbarMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenCustomListToolbar; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface GenCustomListToolbarMapper extends BaseMapper { - - /** - * 根据自定义列表ID查询 - * - * @param customListId - * @return - */ - List getByCustomListId(@Param("customListId") String customListId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 68546bf65c56b00ff587de096d832e3b11531e9a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageCategoryMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; - -/** - *

- * 自定义页面分类 Mapper 接口 - *

- * - * @author zmj - */ -public interface GenCustomPageCategoryMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - List query(); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e980df9b82761b4d546c539de342fc87db86c29b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.xingyun.template.gen.vo.custom.page.GenCustomPageSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.page.QueryGenCustomPageVo; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 自定义页面 Mapper 接口 - *

- * - * @author zmj - * @since 2023-06-20 - */ -public interface GenCustomPageMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryGenCustomPageVo vo); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenCustomPageSelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c97fb1f8657982b3e18cbb54977a550371e20cdf..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorCategoryMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.vo.custom.selector.category.GenCustomSelectorCategorySelectorVo; -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 自定义选择器分类 Mapper 接口 - *

- * - * @author zmj - */ -public interface GenCustomSelectorCategoryMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - List query(); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenCustomSelectorCategorySelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6a159bad40d0f1488946c95a5a19b4acc33a1aa4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -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.entity.GenCustomSelector; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 自定义选择器 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenCustomSelectorMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryGenCustomSelectorVo vo); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenCustomSelectorSelectorVo vo); - - /** - * 查询所有关联了自定义列表的自定义选择器ID - * - * @return - */ - List getRelaGenCustomListIds(@Param("customListId") String customListId); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 144de349f3e6b910bff5ef4e0d426f411bd6e0a7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityCategoryMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.xingyun.template.gen.vo.data.entity.category.GenDataEntityCategorySelectorVo; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据实体分类 Mapper 接口 - *

- * - * @author zmj - */ -public interface GenDataEntityCategoryMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - List query(); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenDataEntityCategorySelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3a1afc2f656eda365554f6558e7553074e2db638..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.starter.web.mapper.BaseMapper; - -/** - *

- * 数据实体明细 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenDataEntityDetailMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 971d5b2ab78c49064eb567a5836e1d8045046417..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntitySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.QueryDataEntityVo; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据实体 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenDataEntityMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryDataEntityVo vo); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenDataEntitySelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 78f67e64900ea9eece41624f29ea0d8ce68c7ef2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjCategoryMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.xingyun.template.gen.vo.data.obj.category.GenDataObjCategorySelectorVo; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据对象分类 Mapper 接口 - *

- * - * @author zmj - */ -public interface GenDataObjCategoryMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - List query(); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenDataObjCategorySelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5b4b80834ac8828aef97f15d21dd1290ee6fe5f1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjDetailMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.starter.web.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据对象明细 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenDataObjDetailMapper extends BaseMapper { - - /** - * 实体明细ID是否已关联数据对象 - * - * @param entityDetailId - * @return - */ - Boolean entityDetailIsRela(@Param("entityDetailId") String entityDetailId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e54c3f02569dded3b05b80a91e277487e12f7af8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.vo.data.obj.GenDataObjSelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.QueryGenDataObjVo; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据对象 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenDataObjMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryGenDataObjVo vo); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") GenDataObjSelectorVo vo); - - /** - * 查询所有关联了数据实体的数据对象ID - * @param entityId - * @return - */ - List getRelaGenDataEntityIds(@Param("entityId") String entityId); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5ad589293786bd08534ea955785722c41a383612..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjQueryDetailMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.starter.web.mapper.BaseMapper; - -/** - *

- * 数据对象自定义查询明细 Mapper 接口 - *

- * - * @author zmj - * @since 2022-09-17 - */ -public interface GenDataObjQueryDetailMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fc1fd247b7b7eb7598afe5ff3650a39aa30a5580..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDetailColumnConfigMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.dto.gen.GenDetailColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDetailColumnConfig; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-12-10 - */ -public interface GenDetailColumnConfigMapper extends BaseMapper { - - /** - * 根据数据对象ID查询 - * - * @param ids - * @return - */ - List getByIds(@Param("ids") List ids); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenDetailColumnConfigDto findById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4e091b2992c13269da7e546e662030a9d1bd9bcd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenGenerateInfoMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import com.lframework.xingyun.template.gen.entity.GenGenerateInfo; -import com.lframework.starter.web.mapper.BaseMapper; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-12-08 - */ -public interface GenGenerateInfoMapper extends BaseMapper { - - /** - * 根据数据对象ID查询 - * - * @param dataObjId - * @return - */ - GenGenerateInfoDto getByDataObjId(String dataObjId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bed9fd1ea7f5ed332657c405dbb0b93b765bf5d7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.components.data.obj.DataObjectQueryObj; -import java.util.List; -import java.util.Map; -import org.apache.ibatis.annotations.Param; - -public interface GenMapper { - - List> findList(@Param("obj") DataObjectQueryObj obj); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5480363254f5e28c0a2b63f1dfea8ad015976584..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryColumnConfigMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.dto.gen.GenQueryColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenQueryColumnConfig; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-12-10 - */ -public interface GenQueryColumnConfigMapper extends BaseMapper { - - /** - * 根据数据对象ID查询 - * - * @param ids - * @return - */ - List getByIds(@Param("ids") List ids); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenQueryColumnConfigDto findById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2d9f30ed8e003e328922c02398a822945b89137d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryParamsColumnConfigMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.dto.gen.GenQueryParamsColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenQueryParamsColumnConfig; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-12-10 - */ -public interface GenQueryParamsColumnConfigMapper extends BaseMapper { - - /** - * 根据数据对象ID查询 - * - * @param ids - * @return - */ - List getByIds(@Param("ids") List ids); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenQueryParamsColumnConfigDto findById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5aad67beaca6159f39543b0e734c1e20b8ac2c9b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableColumnMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.vo.simpledb.QuerySimpleTableColumnVo; -import com.lframework.xingyun.template.gen.dto.simpledb.OriSimpleTableColumnDto; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-05-28 - */ -public interface GenSimpleTableColumnMapper extends BaseMapper { - - /** - * 根据创建Vo查询 - * - * @param vo - * @return - */ - List query(QuerySimpleTableColumnVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e118002359365d6c5fb86163fb5ead488783ff8c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.dto.simpledb.SimpleTableDto; -import com.lframework.xingyun.template.gen.entity.GenSimpleTable; -import com.lframework.starter.web.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-05-28 - */ -public interface GenSimpleTableMapper extends BaseMapper { - - /** - * 根据数据实体ID查询 - * - * @param id - * @return - */ - SimpleTableDto getByEntityId(@Param("id") String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8f65be597175b7f1dc67c3fc946e39aab5c77e97..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenUpdateColumnConfigMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.dto.gen.GenUpdateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenUpdateColumnConfig; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-12-10 - */ -public interface GenUpdateColumnConfigMapper extends BaseMapper { - - /** - * 根据数据对象ID查询 - * - * @param ids - * @return - */ - List getByIds(@Param("ids") List ids); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenUpdateColumnConfigDto findById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f86f4be2f9ee4524f59b7fc74e6f6dc73abad361..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/SimpleDBMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.mappers; - -import com.lframework.xingyun.template.gen.vo.simpledb.SimpleTableSelectorVo; -import com.lframework.xingyun.template.gen.dto.simpledb.OriSimpleTableDto; -import com.lframework.xingyun.template.gen.dto.simpledb.SimpleDBDto; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface SimpleDBMapper extends BaseMapper { - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(SimpleTableSelectorVo vo); - - /** - * 根据TableName查询 - * - * @param tableName - * @return - */ - OriSimpleTableDto getByTableName(@Param("tableName") String tableName); - - /** - * 批量查询 - * - * @param tableNames - * @return - */ - List listByIds(@Param("tableNames") List tableNames); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 941f53b8c7428b9a56fc1ef118da79bf325e61a3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCreateColumnConfigService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.gen.GenCreateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenCreateColumnConfig; -import com.lframework.xingyun.template.gen.vo.gen.UpdateCreateColumnConfigVo; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCreateColumnConfigService extends BaseMpService { - - /** - * 根据数据实体ID查询 - * - * @param entityId - * @return - */ - List getByDataEntityId(String entityId); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(String entityId, List vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCreateColumnConfigDto findById(String id); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index da5203b17daa6038a82ac3178c86c63080698de4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListCategoryService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; -import com.lframework.xingyun.template.gen.vo.custom.list.category.CreateGenCustomListCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.list.category.GenCustomListCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.list.category.UpdateGenCustomListCategoryVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -/** - * 自定义列表分类 Service - * - * @author zmj - */ -public interface GenCustomListCategoryService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - List queryList(); - - /** - * 选择器 - * - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomListCategorySelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCustomListCategory findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateGenCustomListCategoryVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateGenCustomListCategoryVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ccb267a093f444817be64ac48e06ef86cefdeed1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListDetailService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCustomListDetailService extends BaseMpService { - - /** - * 根据自定义列表ID查询 - * @param customListId - * @return - */ - List getByCustomListId(String customListId); - - /** - * 根据自定义列表ID删除 - * @param customListId - */ - void deleteByCustomListId(String customListId); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index da89da22c570a12512b9de0c8001d993301e17a2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListHandleColumnService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomListHandleColumn; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCustomListHandleColumnService extends - BaseMpService { - - /** - * 根据自定义列表ID查询 - * - * @param customListId - * @return - */ - List getByCustomListId(String customListId); - - /** - * 根据自定义列表ID删除 - * - * @param customListId - */ - void deleteByCustomListId(String customListId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c6fe6b63ca7ee61162c16ea0dae26adf1fb4804a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListQueryParamsService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomListQueryParams; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCustomListQueryParamsService extends BaseMpService { - - /** - * 根据自定义列表ID查询 - * @param customListId - * @return - */ - List getByCustomListId(String customListId); - - /** - * 根据自定义列表ID删除 - * @param customListId - */ - void deleteByCustomListId(String customListId); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index be0d2a094d9a3ca6610fd32cbe8cc77b1262213c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomList; -import com.lframework.xingyun.template.gen.vo.custom.list.CreateGenCustomListVo; -import com.lframework.xingyun.template.gen.vo.custom.list.GenCustomListSelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.list.QueryGenCustomListVo; -import com.lframework.xingyun.template.gen.vo.custom.list.UpdateGenCustomListVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCustomListService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QueryGenCustomListVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QueryGenCustomListVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomListSelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCustomList findById(String id); - - /** - * 新增 - * - * @param data - * @return - */ - String create(CreateGenCustomListVo data); - - /** - * 修改 - * - * @param data - */ - void update(UpdateGenCustomListVo data); - - /** - * 根据ID删除 - * @param id - */ - void delete(String id); - - /** - * 启用 - * - * @param id - */ - void enable(String id); - - /** - * 停用 - * - * @param id - */ - void unable(String id); - - /** - * 查询所有关联了数据对象的自定义列表ID - * @return - */ - List getRelaGenDataObjIds(String objId); - - /** - * 查询所有关联了数据实体的自定义列表ID - * @return - */ - List getRelaGenDataEntityIds(String entityId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4bf4f0e15b399c939b86f2b8698b30412f64eadc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListToolbarService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomListToolbar; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCustomListToolbarService extends BaseMpService { - - /** - * 根据自定义列表ID查询 - * - * @param customListId - * @return - */ - List getByCustomListId(String customListId); - - /** - * 根据自定义列表ID删除 - * - * @param customListId - */ - void deleteByCustomListId(String customListId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 08423cf3f7f166857118aeaa02bb338e5e1dd411..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageCategoryService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.vo.custom.page.category.CreateGenCustomPageCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.page.category.UpdateGenCustomPageCategoryVo; -import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -/** - * 自定义页面分类 Service - * - * @author zmj - */ -public interface GenCustomPageCategoryService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - List queryList(); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCustomPageCategory findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateGenCustomPageCategoryVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateGenCustomPageCategoryVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 950d2ccb64ec50c6d41c446a050f8132ef46b44c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java +++ /dev/null @@ -1,73 +0,0 @@ -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 java.util.List; - -public interface GenCustomPageService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, - QueryGenCustomPageVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QueryGenCustomPageVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomPageSelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCustomPage findById(Integer id); - - /** - * 新增 - * - * @param data - * @return - */ - Integer create(CreateGenCustomPageVo data); - - /** - * 修改 - * - * @param data - */ - void update(UpdateGenCustomPageVo data); - - /** - * 根据ID删除 - * - * @param id - */ - void delete(Integer id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c87bd43b23d10abb8790396acb4794b9daa7e430..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorCategoryService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.CreateGenCustomSelectorCategoryVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.GenCustomSelectorCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.custom.selector.category.UpdateGenCustomSelectorCategoryVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -/** - * 自定义选择器分类 Service - * - * @author zmj - */ -public interface GenCustomSelectorCategoryService extends - BaseMpService { - - /** - * 查询列表 - * - * @return - */ - List queryList(); - - /** - * 选择器 - * - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomSelectorCategorySelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCustomSelectorCategory findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateGenCustomSelectorCategoryVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateGenCustomSelectorCategoryVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d8f94f5f1ff85429d2ac3cd05e5f62290d724fe0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenCustomSelector; -import com.lframework.xingyun.template.gen.vo.custom.selector.CreateGenCustomSelectorVo; -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.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenCustomSelectorService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, - QueryGenCustomSelectorVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QueryGenCustomSelectorVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenCustomSelectorSelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenCustomSelector findById(String id); - - /** - * 新增 - * - * @param data - * @return - */ - String create(CreateGenCustomSelectorVo data); - - /** - * 修改 - * - * @param data - */ - void update(UpdateGenCustomSelectorVo data); - - /** - * 根据ID删除 - * - * @param id - */ - void delete(String id); - - /** - * 启用 - * - * @param id - */ - void enable(String id); - - /** - * 停用 - * - * @param id - */ - void unable(String id); - - /** - * 查询所有关联了自定义列表的自定义选择器ID - * - * @return - */ - List getRelaGenCustomListIds(String customListId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d94bbae094b56e68b27743e950e084f89fbba321..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityCategoryService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; -import com.lframework.xingyun.template.gen.vo.data.entity.category.CreateGenDataEntityCategoryVo; -import com.lframework.xingyun.template.gen.vo.data.entity.category.GenDataEntityCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.category.UpdateGenDataEntityCategoryVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -/** - * 数据实体分类 Service - * - * @author zmj - */ -public interface GenDataEntityCategoryService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - List queryList(); - - /** - * 选择器 - * - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenDataEntityCategorySelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenDataEntityCategory findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateGenDataEntityCategoryVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateGenDataEntityCategoryVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index be288b94b86d4abee242e2d27a01893ff911f593..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityDetailService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntityDetailSelectorVo; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenDataEntityDetailService extends BaseMpService { - - /** - * 根据实体ID查询 - * - * @param entityId - * @return - */ - List getByEntityId(String entityId); - - /** - * 根据实体ID删除 - * - * @param entityId - */ - void deleteByEntityId(String entityId); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(GenDataEntityDetailSelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d236ecbbd0c3c725e6f2da4450f8d77b2f1b5a53..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.data.entity.DataEntityGenerateDto; -import com.lframework.xingyun.template.gen.entity.GenDataEntity; -import com.lframework.xingyun.template.gen.vo.data.entity.CreateDataEntityVo; -import com.lframework.xingyun.template.gen.vo.data.entity.GenDataEntitySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.entity.QueryDataEntityVo; -import com.lframework.xingyun.template.gen.vo.data.entity.UpdateDataEntityGenerateVo; -import com.lframework.xingyun.template.gen.vo.data.entity.UpdateDataEntityVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenDataEntityService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QueryDataEntityVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QueryDataEntityVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenDataEntitySelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenDataEntity findById(String id); - - /** - * 创建 - * - * @param data - * @return - */ - String create(CreateDataEntityVo data); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateDataEntityVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void delete(String id); - - /** - * 启用 - * - * @param id - */ - void enable(String id); - - /** - * 停用 - * - * @param id - */ - void unable(String id); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - DataEntityGenerateDto getGenerateById(String id); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(UpdateDataEntityGenerateVo vo); - - /** - * 同步数据表 - * - * @param id - */ - void syncTable(String id); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a7eda58cd1ca68bb5481d22dca67ea79abaec5ad..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjCategoryService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; -import com.lframework.xingyun.template.gen.vo.data.obj.category.CreateGenDataObjCategoryVo; -import com.lframework.xingyun.template.gen.vo.data.obj.category.GenDataObjCategorySelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.category.UpdateGenDataObjCategoryVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -/** - * 数据对象分类 Service - * - * @author zmj - */ -public interface GenDataObjCategoryService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - List queryList(); - - /** - * 选择器 - * - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - GenDataObjCategorySelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenDataObjCategory findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateGenDataObjCategoryVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateGenDataObjCategoryVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ef87c7e51804009c76024144084a762bbdeb8e48..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjDetailService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenDataObjDetailService extends BaseMpService { - - /** - * 根据数据对象ID查询 - * - * @param objId - * @return - */ - List getByObjId(String objId); - - /** - * 根据数据对象ID删除 - * - * @param objId - */ - void deleteByObjId(String objId); - - /** - * 实体明细ID是否已关联数据对象 - * - * @param entityDetailId - * @return - */ - Boolean entityDetailIsRela(String entityDetailId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f11fcdd0f7098d810bee7acf44b17772b10bbd82..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjQueryDetailService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenDataObjQueryDetail; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenDataObjQueryDetailService extends BaseMpService { - - /** - * 根据数据对象ID查询 - * - * @param objId - * @return - */ - List getByObjId(String objId); - - /** - * 根据数据对象ID删除 - * - * @param objId - */ - void deleteByObjId(String objId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index dbdba994e783e013b9173425050bf2d87f442ac3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.entity.GenDataObj; -import com.lframework.xingyun.template.gen.vo.data.obj.CreateGenDataObjVo; -import com.lframework.xingyun.template.gen.vo.data.obj.GenDataObjSelectorVo; -import com.lframework.xingyun.template.gen.vo.data.obj.QueryGenDataObjVo; -import com.lframework.xingyun.template.gen.vo.data.obj.UpdateGenDataObjVo; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenDataObjService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QueryGenDataObjVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QueryGenDataObjVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, GenDataObjSelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenDataObj findById(String id); - - /** - * 新增 - * - * @param data - * @return - */ - String create(CreateGenDataObjVo data); - - /** - * 修改 - * - * @param data - */ - void update(UpdateGenDataObjVo data); - - /** - * 根据ID删除 - * - * @param id - */ - void delete(String id); - - /** - * 启用 - * - * @param id - */ - void enable(String id); - - /** - * 停用 - * - * @param id - */ - void unable(String id); - - /** - * 查询所有关联了数据实体的数据对象ID - * @return - */ - List getRelaGenDataEntityIds(String entityId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b6d634de481fb0cda08b3745f6d8d872f28340c7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDetailColumnConfigService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.gen.GenDetailColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenDetailColumnConfig; -import com.lframework.xingyun.template.gen.vo.gen.UpdateDetailColumnConfigVo; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenDetailColumnConfigService extends BaseMpService { - - /** - * 根据数据实体ID查询 - * - * @param entityId - * @return - */ - List getByDataEntityId(String entityId); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(String entityId, List vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenDetailColumnConfigDto findById(String id); - - /** - * 根据ID查询 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0d17eca331f57ab882887a95fa8f751dd2bb765a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryColumnConfigService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.gen.GenQueryColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenQueryColumnConfig; -import com.lframework.xingyun.template.gen.vo.gen.UpdateQueryColumnConfigVo; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenQueryColumnConfigService extends BaseMpService { - - /** - * 根据数据对象ID查询 - * - * @param entityId - * @return - */ - List getByDataEntityId(String entityId); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(String entityId, List vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenQueryColumnConfigDto findById(String id); - - /** - * 根据ID查询 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3cd6a18ffabbb9b37f5a4172c6780cdc7d91fec7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryParamsColumnConfigService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.gen.GenQueryParamsColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenQueryParamsColumnConfig; -import com.lframework.xingyun.template.gen.vo.gen.UpdateQueryParamsColumnConfigVo; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenQueryParamsColumnConfigService extends - BaseMpService { - - /** - * 根据数据实体ID查询 - * - * @param entityId - * @return - */ - List getByDataEntityId(String entityId); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(String entityId, List vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenQueryParamsColumnConfigDto findById(String id); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 76aa98d38c1dbee613ce69bdee452c35a000dfc3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenUpdateColumnConfigService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.gen.GenUpdateColumnConfigDto; -import com.lframework.xingyun.template.gen.entity.GenUpdateColumnConfig; -import com.lframework.xingyun.template.gen.vo.gen.UpdateUpdateColumnConfigVo; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface GenUpdateColumnConfigService extends BaseMpService { - - /** - * 根据数据实体ID查询 - * - * @param entityId - * @return - */ - List getByDataEntityId(String entityId); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(String entityId, List vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - GenUpdateColumnConfigDto findById(String id); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5b73540fb5b42b164dd09e410397967e267bf105..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenerateInfoService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; -import com.lframework.xingyun.template.gen.entity.GenGenerateInfo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateGenerateInfoVo; -import com.lframework.starter.web.service.BaseMpService; - -public interface GenerateInfoService extends BaseMpService { - - /** - * 根据数据实体ID查询 - * - * @param entityId - * @return - */ - GenGenerateInfoDto getByEntityId(String entityId); - - /** - * 修改生成器配置信息 - * - * @param vo - */ - void updateGenerate(String dataObjId, UpdateGenerateInfoVo vo); - - /** - * 根据数据实体ID删除 - * - * @param entityId - */ - void deleteByEntityId(String entityId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 66bbb8499706228d3912dabaead15cc13c245579..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/SimpleDBService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.vo.simpledb.SimpleTableSelectorVo; -import com.lframework.xingyun.template.gen.dto.simpledb.OriSimpleTableDto; -import com.lframework.xingyun.template.gen.dto.simpledb.SimpleDBDto; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseService; -import java.util.List; - -public interface SimpleDBService extends BaseService { - - /** - * 查询当前数据库名称 - * - * @return - */ - String getCurrentDBName(); - - /** - * 选择器 - * - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, SimpleTableSelectorVo vo); - - /** - * 根据表名查询 - * - * @return - */ - OriSimpleTableDto getByTableName(String tableName); - - /** - * 批量查询 - * - * @param tableNames - * @return - */ - List listByIds(List tableNames); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9e3c67081bf9222342acf803e046ecd7624b9c39..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/SimpleTableColumnService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.template.gen.service; - -import com.lframework.xingyun.template.gen.vo.simpledb.QuerySimpleTableColumnVo; -import com.lframework.xingyun.template.gen.entity.GenSimpleTableColumn; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface SimpleTableColumnService extends BaseMpService { - - /** - * 查询列信息 - * - * @param vo - * @return - */ - List query(QuerySimpleTableColumnVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3ff6f17b66323f0487a6846e45e2f33deaa8928c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/CreateGenCustomListVo.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.xingyun.template.gen.enums.GenCustomListType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class CreateGenCustomListVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 列表类型 - */ - @ApiModelProperty(value = "列表类型", required = true) - @NotNull(message = "列表类型不能为空！") - @IsEnum(message = "列表类型不能为空！", enumClass = GenCustomListType.class) - private Integer listType; - - /** - * 数据对象ID - */ - @ApiModelProperty(value = "数据对象ID", required = true) - @NotBlank(message = "数据对象ID不能为空！") - private String dataObjId; - - /** - * 表单Label宽度 - */ - @ApiModelProperty(value = "表单Label宽度", required = true) - @NotNull(message = "表单Label宽度不能为空！") - @Min(value = 1, message = "表单Label宽度不允许小于0！") - private Integer labelWidth; - - /** - * 是否分页 - */ - @ApiModelProperty(value = "是否分页", required = true) - @NotNull(message = "是否分页不能为空！") - private Boolean hasPage; - - /** - * 是否树形列表 - */ - @ApiModelProperty(value = "是否树形列表", required = true) - @NotNull(message = "是否树形列表不能为空！") - private Boolean treeData; - - /** - * ID字段 - */ - @ApiModelProperty(value = "ID字段", required = true) - @NotBlank(message = "ID字段不能为空！") - private String idColumn; - - /** - * ID字段关联ID - */ - @ApiModelProperty(value = "ID字段关联ID", required = true) - @NotBlank(message = "ID字段不能为空！") - private String idColumnRelaId; - - /** - * 父级ID字段 - */ - @ApiModelProperty("父级ID字段") - private String treePidColumn; - - /** - * 父级ID字段关联ID - */ - @ApiModelProperty("父级ID字段关联ID") - private String treePidColumnRelaId; - - /** - * 树形节点字段 - */ - @ApiModelProperty("树形节点字段") - private String treeNodeColumn; - - /** - * 树形节点字段关联ID - */ - @ApiModelProperty("树形节点字段关联ID") - private String treeNodeColumnRelaId; - - /** - * 子节点Key值 - */ - @ApiModelProperty("子节点Key值") - private String treeChildrenKey; - - /** - * 是否允许导出 - */ - @ApiModelProperty("是否允许导出") - @NotNull(message = "是否允许导出不能为空！") - private Boolean allowExport; - - /** - * 查询条件 - */ - @ApiModelProperty("查询条件") - @Valid - private List queryParams; - - /** - * 列表配置 - */ - @ApiModelProperty(value = "列表配置", required = true) - @NotEmpty(message = "列表配置不能为空！") - @Valid - private List details; - - /** - * 查询前置SQL - */ - @ApiModelProperty("查询前置SQL") - private String queryPrefixSql; - - /** - * 查询后置SQL - */ - @ApiModelProperty("查询后置SQL") - private String querySuffixSql; - - /** - * 后置SQL - */ - @ApiModelProperty("后置SQL") - private String suffixSql; - - /** - * 工具栏 - */ - @Valid - @ApiModelProperty("工具栏") - private List toolbars; - - /** - * 操作列 - */ - @Valid - @ApiModelProperty("操作列") - private List handleColumns; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 36acf5facc72ac9215fb80403d4e11b226ae5f20..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListDetailVo.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenCustomListDetailVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private String id; - - /** - * 关联ID - */ - @ApiModelProperty(value = "关联ID") - private String relaId; - - /** - * 宽度类型 - */ - @ApiModelProperty(value = "宽度类型", required = true) - @NotNull(message = "宽度类型不能为空！") - @IsEnum(message = "宽度类型不能为空！", enumClass = GenQueryWidthType.class) - private Integer widthType; - - /** - * 是否页面排序 - */ - @ApiModelProperty(value = "是否页面排序", required = true) - @NotNull(message = "请选择是否页面排序！") - private Boolean sortable; - - /** - * 宽度 - */ - @ApiModelProperty(value = "宽度", required = true) - @NotNull(message = "宽度不能为空！") - @Min(value = 1, message = "宽度必须大于0！") - private Integer width; - - /** - * 类型 - */ - @ApiModelProperty(value = "类型", required = true) - @NotNull(message = "类型不能为空！") - @IsEnum(message = "类型不能为空！", enumClass = GenCustomListDetailType.class) - private Integer type; - - /** - * 格式化脚本 - */ - @ApiModelProperty("格式化脚本") - private String formatter; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c8e644d57264c9afe5d4db551bcc0db1cdde28fc..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListHandleColumnVo.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnType; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnViewType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenCustomListHandleColumnVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - @NotNull(message = "显示名称不能为空！") - private String name; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - @NotNull(message = "显示类型不能为空！") - @IsEnum(enumClass = GenCustomListBtnViewType.class, message = "显示类型格式错误！") - private String viewType; - - /** - * 按钮类型 - */ - @ApiModelProperty("按钮类型") - @NotNull(message = "按钮类型不能为空！") - @IsEnum(enumClass = GenCustomListBtnType.class, message = "显示类型格式错误！") - private Integer btnType; - - /** - * 按钮配置 - */ - @ApiModelProperty("按钮配置") - private String btnConfig; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 请求参数 - */ - @ApiModelProperty("请求参数") - private String requestParam; - - /** - * 宽度 - */ - @ApiModelProperty(value = "宽度", required = true) - @NotNull(message = "宽度不能为空！") - @Min(value = 0, message = "宽度必须大于0！") - private Integer width; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 34628a474939c0c455ee048cf323be98b98d7235..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListQueryParamsVo.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.xingyun.template.gen.enums.GenCustomListDetailType; -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenCustomListQueryParamsVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 关联ID - */ - @ApiModelProperty(value = "关联ID", required = true) - @NotBlank(message = "关联ID不能为空！") - private String relaId; - - /** - * 前端显示 - */ - @ApiModelProperty(value = "前端显示", required = true) - @NotNull(message = "前端显示不能为空！") - private Boolean frontShow; - - /** - * 查询类型 - */ - @ApiModelProperty(value = "查询类型", required = true) - @NotNull(message = "查询类型不能为空！") - @IsEnum(message = "查询类型不能为空！", enumClass = GenQueryType.class) - private Integer queryType; - - /** - * 表单宽度 - */ - @ApiModelProperty(value = "表单宽度", required = true) - @NotNull(message = "表单宽度不能为空！") - @Min(value = 1, message = "表单宽度不允许小于0！") - @Max(value = 24, message = "表单宽度不允许大于24！") - private Integer formWidth; - - /** - * 默认值 - */ - @ApiModelProperty("默认值") - private Object defaultValue; - - /** - * 类型 - */ - @ApiModelProperty(value = "类型", required = true) - @NotNull(message = "类型不能为空！") - @IsEnum(message = "类型不能为空！", enumClass = GenCustomListDetailType.class) - private Integer type; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 02d491c5a09997d02470e1920be37f9fe571f1eb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListSelectorVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomListSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8beb586b856c1b6e5298a4960b51937a982c35aa..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListToolbarVo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnType; -import com.lframework.xingyun.template.gen.enums.GenCustomListBtnViewType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenCustomListToolbarVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 显示名称 - */ - @ApiModelProperty("显示名称") - @NotNull(message = "显示名称不能为空！") - private String name; - - /** - * 显示类型 - */ - @ApiModelProperty("显示类型") - @NotNull(message = "显示类型不能为空！") - @IsEnum(enumClass = GenCustomListBtnViewType.class, message = "显示类型格式错误！") - private String viewType; - - /** - * 按钮类型 - */ - @ApiModelProperty("按钮类型") - @NotNull(message = "按钮类型不能为空！") - @IsEnum(enumClass = GenCustomListBtnType.class, message = "显示类型格式错误！") - private Integer btnType; - - /** - * 按钮配置 - */ - @ApiModelProperty("按钮配置") - private String btnConfig; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 请求参数 - */ - @ApiModelProperty("请求参数") - private String requestParam; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5eaeb8e375d4de64f810dc023850bcf1774988cf..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/QueryGenCustomListVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 查询自定义列表Vo - */ -@Data -public class QueryGenCustomListVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ecec21f7ee43abe4a38be81da9a7c4a74badd6b5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/UpdateGenCustomListVo.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list; - -import com.lframework.xingyun.template.gen.enums.GenCustomListType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenCustomListVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 列表类型 - */ - @ApiModelProperty(value = "列表类型", required = true) - @NotNull(message = "列表类型不能为空！") - @IsEnum(message = "列表类型不能为空！", enumClass = GenCustomListType.class) - private Integer listType; - - /** - * 表单Label宽度 - */ - @ApiModelProperty(value = "表单Label宽度", required = true) - @NotNull(message = "表单Label宽度不能为空！") - @Min(value = 1, message = "表单Label宽度不允许小于0！") - private Integer labelWidth; - - /** - * 是否分页 - */ - @ApiModelProperty(value = "是否分页", required = true) - @NotNull(message = "是否分页不能为空！") - private Boolean hasPage; - - /** - * 是否树形列表 - */ - @ApiModelProperty(value = "是否树形列表", required = true) - @NotNull(message = "是否树形列表不能为空！") - private Boolean treeData; - - /** - * ID字段 - */ - @ApiModelProperty(value = "ID字段", required = true) - @NotBlank(message = "ID字段不能为空！") - private String idColumn; - - /** - * ID字段关联ID - */ - @ApiModelProperty(value = "ID字段关联ID", required = true) - @NotBlank(message = "ID字段不能为空！") - private String idColumnRelaId; - - /** - * 父级ID字段 - */ - @ApiModelProperty("父级ID字段") - private String treePidColumn; - - /** - * 父级ID字段关联ID - */ - @ApiModelProperty("父级ID字段关联ID") - private String treePidColumnRelaId; - - /** - * 树形节点字段 - */ - @ApiModelProperty("树形节点字段") - private String treeNodeColumn; - - /** - * 树形节点字段关联ID - */ - @ApiModelProperty("树形节点字段关联ID") - private String treeNodeColumnRelaId; - - /** - * 子节点Key值 - */ - @ApiModelProperty("子节点Key值") - private String treeChildrenKey; - - /** - * 默认值 - */ - @ApiModelProperty("默认值") - private String defaultValue; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 是否允许导出 - */ - @ApiModelProperty("是否允许导出") - @NotNull(message = "是否允许导出不能为空！") - private Boolean allowExport; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; - - /** - * 查询条件 - */ - @ApiModelProperty("查询条件") - @Valid - private List queryParams; - - /** - * 列表配置 - */ - @ApiModelProperty(value = "列表配置", required = true) - @NotEmpty(message = "列表配置不能为空！") - @Valid - private List details; - - /** - * 查询前置SQL - */ - @ApiModelProperty("查询前置SQL") - private String queryPrefixSql; - - /** - * 查询后置SQL - */ - @ApiModelProperty("查询后置SQL") - private String querySuffixSql; - - /** - * 后置SQL - */ - @ApiModelProperty("后置SQL") - private String suffixSql; - - /** - * 工具栏 - */ - @Valid - @ApiModelProperty("工具栏") - private List toolbars; - - /** - * 操作列 - */ - @Valid - @ApiModelProperty("操作列") - private List handleColumns; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a45213769ec1771c9600e3ad36a562e108dafb05..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/CreateGenCustomListCategoryVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list.category; - -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 CreateGenCustomListCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e6d369f47dc46d174233f07dab5737b99ca5f9b6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/GenCustomListCategorySelectorVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list.category; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomListCategorySelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 064c41f8545ee5cd9c364aa6542acb7de1cb0bd4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/UpdateGenCustomListCategoryVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.list.category; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenCustomListCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 60fb2587c6b91cf9f52831053fa3d6808067919b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/CreateGenCustomPageVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.page; - -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 CreateGenCustomPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 页面代码 - */ - @ApiModelProperty(value = "页面代码", required = true) - @NotBlank(message = "页面代码不能为空！") - private String pageCode; - - /** - * 脚本代码 - */ - @ApiModelProperty(value = "脚本代码", required = true) - @NotBlank(message = "脚本代码不能为空！") - private String scriptCode; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9f17ffbabc2edbd2e4872e9bdcecf2e33ee9b84d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/QueryGenCustomPageVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.page; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 查询自定义页面Vo - */ -@Data -public class QueryGenCustomPageVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private Integer id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ed8b01253595e65c97ab594f3c2e8d4937b5b28b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/UpdateGenCustomPageVo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.page; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenCustomPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private Integer id; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 页面代码 - */ - @ApiModelProperty(value = "页面代码", required = true) - @NotBlank(message = "页面代码不能为空！") - private String pageCode; - - /** - * 脚本代码 - */ - @ApiModelProperty(value = "脚本代码", required = true) - @NotBlank(message = "脚本代码不能为空！") - private String scriptCode; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4aa93d41b9a278a8f6b03b3a0ef07cca2024e6c2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/CreateGenCustomPageCategoryVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.page.category; - -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 CreateGenCustomPageCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty(value = "父级ID") - private String parentId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5eb6dfe6febceb76471fd2d3eb776498a1727b37..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/UpdateGenCustomPageCategoryVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.page.category; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenCustomPageCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d481edf98fff4dc46996e42219db513c69bec5e1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/CreateGenCustomSelectorVo.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector; - -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 CreateGenCustomSelectorVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 自定义列表ID - */ - @ApiModelProperty(value = "自定义列表ID", required = true) - @NotBlank(message = "自定义列表ID不能为空！") - private String customListId; - - /** - * 对话框标题 - */ - @ApiModelProperty(value = "对话框标题") - private String dialogTittle; - - /** - * 对话框宽度 - */ - @ApiModelProperty(value = "对话框宽度", required = true) - @NotBlank(message = "对话框宽度不能为空！") - private String dialogWidth; - - /** - * 占位符 - */ - @ApiModelProperty("占位符") - private String placeholder; - - /** - * ID字段 - */ - @ApiModelProperty(value = "ID字段", required = true) - @NotBlank(message = "ID字段不能为空！") - private String idColumn; - - /** - * ID字段关联ID - */ - @ApiModelProperty(value = "ID字段关联ID", required = true) - @NotBlank(message = "ID字段不能为空！") - private String idColumnRelaId; - - /** - * 名称字段 - */ - @ApiModelProperty(value = "名称字段", required = true) - @NotBlank(message = "名称字段不能为空！") - private String nameColumn; - - /** - * 名称字段关联ID - */ - @ApiModelProperty(value = "名称字段关联ID", required = true) - @NotBlank(message = "名称字段不能为空！") - private String nameColumnRelaId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 70abb475cbe167adc96f333d72cea3e0559ce445..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/GenCustomSelectorSelectorVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomSelectorSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index dd50f0ec5cdd0823f52a853676cd847aaef8d896..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/QueryGenCustomSelectorVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 查询自定义选择器Vo - */ -@Data -public class QueryGenCustomSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e30282015ed5aeefa62a28a49613fa0cd907708b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/UpdateGenCustomSelectorVo.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenCustomSelectorVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 对话框标题 - */ - @ApiModelProperty(value = "对话框标题") - private String dialogTittle; - - /** - * 对话框宽度 - */ - @ApiModelProperty(value = "对话框宽度", required = true) - @NotBlank(message = "对话框宽度不能为空！") - private String dialogWidth; - - /** - * 占位符 - */ - @ApiModelProperty("占位符") - private String placeholder; - - /** - * ID字段 - */ - @ApiModelProperty("ID字段") - private String idColumn; - - /** - * ID字段关联ID - */ - @ApiModelProperty("ID字段关联ID") - private String idColumnRelaId; - - /** - * 名称字段 - */ - @ApiModelProperty("名称字段") - private String nameColumn; - - /** - * 名称字段关联ID - */ - @ApiModelProperty("名称字段关联ID") - private String nameColumnRelaId; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f84cb40e712a09550ee4603499d872e797c4dd52..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/CreateGenCustomSelectorCategoryVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector.category; - -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 CreateGenCustomSelectorCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b7ce894772ecdc7ce51c90f18f66b5190d1dc56c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/GenCustomSelectorCategorySelectorVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector.category; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenCustomSelectorCategorySelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5e413b008934de48185b5f4c0040eb127511e7f7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/UpdateGenCustomSelectorCategoryVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.custom.selector.category; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenCustomSelectorCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2d03016e592a2805f8287f78145a9b84dbd0655d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/CreateDataEntityVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import lombok.Data; - -@Data -public class CreateDataEntityVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 数据表 - */ - @ApiModelProperty(value = "数据表", required = true) - @NotBlank(message = "数据表不能为空！") - private String tableName; - - /** - * 字段信息 - */ - @ApiModelProperty(value = "字段信息", required = true) - @Valid - @NotEmpty(message = "字段信息不能为空！") - private List columns; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 37162e90edd1a2322832b001f8b031a6edf11b2f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailSelectorVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -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 GenDataEntityDetailSelectorVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 数据实体ID - */ - @ApiModelProperty("数据实体ID") - @NotBlank(message = "数据实体ID不能为空！") - private String entityId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 66bbf20e96467645ecb61886685457639f53453e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailVo.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.xingyun.template.gen.enums.GenOrderType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenDataEntityDetailVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 字段显示名称 - */ - @ApiModelProperty(value = "字段显示名称", required = true) - @NotBlank(message = "显示名称不能为空！") - private String name; - - /** - * 数据类型 - */ - @ApiModelProperty(value = "数据类型", required = true) - @NotNull(message = "数据类型不能为空！") - @IsEnum(message = "数据类型格式不正确！", enumClass = GenDataType.class) - private Integer dataType; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 显示类型 - */ - @ApiModelProperty(value = "显示类型", required = true) - @NotNull(message = "显示类型不能为空！") - @IsEnum(message = "显示类型格式不正确！", enumClass = GenDataType.class) - private Integer viewType; - - /** - * 是否内置枚举 - */ - @ApiModelProperty(value = "是否内置枚举", required = true) - @NotNull(message = "是否内置枚举不能为空！") - private Boolean fixEnum; - - /** - * 后端枚举名 - */ - @ApiModelProperty("后端枚举名") - private String enumBack; - - /** - * 前端枚举名 - */ - @ApiModelProperty("前端枚举名") - private String enumFront; - - /** - * 正则表达式 - */ - @ApiModelProperty("正则表达式") - private String regularExpression; - - /** - * 是否排序字段 - */ - @ApiModelProperty(value = "是否排序字段", required = true) - @NotNull(message = "是否排序字段不能为空！") - private Boolean isOrder; - - /** - * 排序类型 - */ - @ApiModelProperty("排序类型") - @IsEnum(message = "排序类型格式不正确！", enumClass = GenOrderType.class) - private String orderType; - - /** - * 数据字典ID - */ - @ApiModelProperty("数据字典ID") - private String dataDicId; - - /** - * 自定义选择器ID - */ - @ApiModelProperty("自定义选择器ID") - private String customSelectorId; - - /** - * 长度 - */ - @ApiModelProperty("长度") - @Min(value = 1, message = "长度必须大于0！") - private Long len; - - /** - * 小数位数 - */ - @ApiModelProperty("小数位数") - @Min(value = 1, message = "小数位数必须大于0！") - private Integer decimals; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index eeac666d4d436839f4986274c23b141fb4fea38c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntitySelectorVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntitySelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e3fd8253756542d09960b09b98088841cdb4f084..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/QueryDataEntityVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 查询数据实体列表Vo - */ -@Data -public class QueryDataEntityVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b7aeb4514e22bbc27a1cbdd6b684b41ffc108791..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityGenerateVo.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -import com.lframework.xingyun.template.gen.vo.gen.UpdateCreateColumnConfigVo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateDetailColumnConfigVo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateGenerateInfoVo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateQueryColumnConfigVo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateQueryParamsColumnConfigVo; -import com.lframework.xingyun.template.gen.vo.gen.UpdateUpdateColumnConfigVo; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateDataEntityGenerateVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 基础设置 - */ - @ApiModelProperty(value = "基础设置", required = true) - @Valid - @NotNull(message = "基本设置不能为空！") - private UpdateGenerateInfoVo generateInfo; - - /** - * 新增配置 - */ - @ApiModelProperty("新增配置") - @Valid - private List createConfigs; - - /** - * 修改配置 - */ - @ApiModelProperty("修改配置") - @Valid - private List updateConfigs; - - /** - * 查询配置 - */ - @ApiModelProperty("查询配置") - @Valid - private List queryConfigs; - - /** - * 查询参数配置 - */ - @ApiModelProperty("查询参数配置") - @Valid - private List queryParamsConfigs; - - /** - * 详情配置 - */ - @ApiModelProperty("详情配置") - @Valid - private List detailConfigs; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6c51b45db15e14586153a29bbe5ddf31bbbbb7ae..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityVo.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateDataEntityVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; - - /** - * 字段信息 - */ - @ApiModelProperty(value = "字段信息", required = true) - @Valid - @NotEmpty(message = "字段信息不能为空！") - private List columns; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3faf7d9fd8b19a3c92aade49a05fd96811070d8f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/CreateGenDataEntityCategoryVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity.category; - -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 CreateGenDataEntityCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 10d78f5fa089a189984e2d43398b2aa217ea995c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/GenDataEntityCategorySelectorVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity.category; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataEntityCategorySelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0d766263f74a35049323642e30132371812e9ec8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/UpdateGenDataEntityCategoryVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.entity.category; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenDataEntityCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b0e73b63465f893b7c1ae93681f91c4162cb1c3f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/CreateGenDataObjVo.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import lombok.Data; - -@Data -public class CreateGenDataObjVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 主表 - */ - @ApiModelProperty(value = "主表", required = true) - @NotBlank(message = "主表不能为空！") - private String mainTableId; - - /** - * 主表别名 - */ - @ApiModelProperty(value = "主表别名", required = true) - @NotBlank(message = "主表别名不能为空！") - private String mainTableAlias; - - /** - * 关联信息 - */ - @ApiModelProperty(value = "关联信息") - @Valid - private List columns; - - /** - * 自定义查询 - */ - @ApiModelProperty(value = "自定义查询") - @Valid - private List queryColumns; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 52a7b2b69e87e1b0f783c5f30704714324d4dae4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjDetailVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj; - -import com.lframework.xingyun.template.gen.enums.GenRelaMode; -import com.lframework.xingyun.template.gen.enums.GenRelaType; -import com.lframework.starter.web.components.validation.IsEnum; -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.NotEmpty; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenDataObjDetailVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 主表字段 - */ - @ApiModelProperty(value = "主表字段", required = true) - @NotEmpty(message = "主表字段不能为空！") - private List mainTableDetailIds; - - /** - * 关联类型 - */ - @ApiModelProperty(value = "关联类型", required = true) - @NotNull(message = "关联类型不能为空！") - @IsEnum(message = "关联类型不能为空！", enumClass = GenRelaType.class) - private Integer relaType; - - /** - * 关联方式 - */ - @ApiModelProperty(value = "关联方式", required = true) - @NotNull(message = "关联方式不能为空！") - @IsEnum(message = "关联方式不能为空！", enumClass = GenRelaMode.class) - private Integer relaMode; - - /** - * 子表ID - */ - @ApiModelProperty(value = "子表ID", required = true) - @NotBlank(message = "子表ID不能为空！") - private String subTableId; - - /** - * 子表别名 - */ - @ApiModelProperty(value = "子表别名", required = true) - @NotBlank(message = "子表别名不能为空！") - private String subTableAlias; - - /** - * 子表字段 - */ - @ApiModelProperty(value = "子表字段", required = true) - @NotEmpty(message = "子表字段不能为空！") - private List subTableDetailIds; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 02821bfae213b03d10f531060bbd3db4a1bea26e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjQueryDetailVo.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj; - -import com.lframework.xingyun.template.gen.enums.GenDataType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class GenDataObjQueryDetailVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 显示名称 - */ - @ApiModelProperty(value = "显示名称", required = true) - @NotBlank(message = "显示名称不能为空！") - private String customName; - - /** - * 自定义SQL - */ - @ApiModelProperty(value = "自定义SQL", required = true) - @NotBlank(message = "自定义SQL不能为空！") - private String customSql; - - /** - * 别名 - */ - @ApiModelProperty(value = "别名", required = true) - @NotBlank(message = "别名不能为空！") - private String customAlias; - - /** - * 数据类型 - */ - @ApiModelProperty(value = "数据类型", required = true) - @NotNull(message = "数据类型不能为空！") - @IsEnum(message = "数据类型格式不正确！", enumClass = GenDataType.class) - private Integer dataType; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 373174fcae7726142e09d98b83cc799d7060cc5a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjSelectorVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataObjSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 18b53d3fd42deeea9d69a0375a5c44ee483c6e11..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/QueryGenDataObjVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 查询数据对象列表Vo - */ -@Data -public class QueryGenDataObjVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0dce24521cc46b98f6f19aa5878f1a55342e2064..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/UpdateGenDataObjVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenDataObjVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 主表别名 - */ - @ApiModelProperty(value = "主表别名", required = true) - @NotBlank(message = "主表别名不能为空！") - private String mainTableAlias; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; - - /** - * 关联信息 - */ - @ApiModelProperty(value = "关联信息") - @Valid - private List columns; - - /** - * 自定义查询 - */ - @ApiModelProperty(value = "自定义查询") - @Valid - private List queryColumns; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1554d2ce4ac979259633ff59e718a48a3834b64a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/GenDataObjCategorySelectorVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj.category; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GenDataObjCategorySelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4ea5fb5419a38efceb6de841a8a246d8310676df..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/UpdateGenDataObjCategoryVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.data.obj.category; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenDataObjCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c6885d40f9e87990a47f4b2d8de6bc655ba07d05..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateDetailColumnConfigVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.gen; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateDetailColumnConfigVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private String id; - - /** - * 列宽 - */ - @ApiModelProperty(value = "列宽", required = true) - @NotNull(message = "列宽不能为空！") - private Integer span; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 095301c47556bcf21ce16a74624709b6837b1908..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateGenerateInfoVo.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.gen; - -import com.lframework.xingyun.template.gen.enums.GenKeyType; -import com.lframework.xingyun.template.gen.enums.GenTemplateType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateGenerateInfoVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 生成模板类型 - */ - @ApiModelProperty(value = "生成模板类型", required = true) - @NotNull(message = "生成模板类型不能为空！") - @IsEnum(message = "生成模板类型格式不正确！", enumClass = GenTemplateType.class) - private Integer templateType; - - /** - * 包名 - */ - @ApiModelProperty(value = "包名", required = true) - @NotBlank(message = "包名不能为空！") - private String packageName; - - /** - * 模块名称 - */ - @ApiModelProperty(value = "模块名称", required = true) - @NotBlank(message = "模块名称不能为空！") - private String moduleName; - - /** - * 业务名称 - */ - @ApiModelProperty(value = "业务名称", required = true) - @NotBlank(message = "业务名称不能为空！") - private String bizName; - - /** - * 类名 - */ - @ApiModelProperty(value = "类名", required = true) - @NotBlank(message = "类名不能为空！") - private String className; - - /** - * 类描述 - */ - @ApiModelProperty(value = "类描述", required = true) - @NotBlank(message = "类描述不能为空！") - private String classDescription; - - /** - * 父级菜单ID - */ - @ApiModelProperty("父级菜单ID") - private String parentMenuId; - - /** - * 主键类型 - */ - @ApiModelProperty(value = "主键类型", required = true) - @NotNull(message = "主键类型不能为空！") - @IsEnum(message = "主键类型格式不正确！", enumClass = GenKeyType.class) - private Integer keyType; - - /** - * 作者 - */ - @ApiModelProperty("作者") - private String author; - - /** - * 本级菜单编号 - */ - @ApiModelProperty(value = "本级菜单编号", required = true) - @NotNull(message = "本级菜单编号不能为空！") - private String menuCode; - - /** - * 本级菜单名称 - */ - @ApiModelProperty(value = "本级菜单名称", required = true) - @NotNull(message = "本级菜单名称不能为空！") - private String menuName; - - /** - * 详情页Span总数量 - */ - @ApiModelProperty(value = "详情页Span总数量", required = true) - @NotNull(message = "详情页Span总数量不能为空！") - @Min(value = 1, message = "详情页Span总数量必须大于0！") - private Integer detailSpan; - - /** - * 是否应用缓存 - */ - @ApiModelProperty(value = "是否应用缓存", required = true) - @NotNull(message = "是否应用缓存不能为空！") - private Boolean isCache; - - /** - * 是否内置删除功能 - */ - @ApiModelProperty(value = "是否内置删除功能", required = true) - @NotNull(message = "是否内置删除功能不能为空！") - private Boolean hasDelete; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 44cf497f1ec55a2c4988cd7663b09bb1dd6eff4c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryColumnConfigVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.gen; - -import com.lframework.xingyun.template.gen.enums.GenQueryWidthType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateQueryColumnConfigVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private String id; - - /** - * 宽度类型 - */ - @ApiModelProperty(value = "宽度类型", required = true) - @NotNull(message = "宽度类型不能为空！") - @IsEnum(message = "宽度类型不能为空！", enumClass = GenQueryWidthType.class) - private Integer widthType; - - /** - * 是否页面排序 - */ - @ApiModelProperty(value = "是否页面排序", required = true) - @NotNull(message = "请选择是否页面排序！") - private Boolean sortable; - - /** - * 宽度 - */ - @ApiModelProperty(value = "宽度", required = true) - @NotNull(message = "宽度不能为空！") - @Min(value = 1, message = "宽度必须大于0！") - private Integer width; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 23cf77e37def4bcafa04f3cbfcc2779253dacdc2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryParamsColumnConfigVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.gen; - -import com.lframework.xingyun.template.gen.enums.GenQueryType; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateQueryParamsColumnConfigVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private String id; - - /** - * 查询类型 - */ - @ApiModelProperty(value = "查询类型", required = true) - @NotNull(message = "查询类型不能为空！") - @IsEnum(message = "查询类型不能为空！", enumClass = GenQueryType.class) - private Integer queryType; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 939f286f86dd20b561f8b199ed9665c2dc948feb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateUpdateColumnConfigVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.gen; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateUpdateColumnConfigVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private String id; - - /** - * 是否必填 - */ - @ApiModelProperty(value = "是否必填", required = true) - @NotNull(message = "是否必填不能为空！") - private Boolean required; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 892008957030bf8bbeec8ec6019a0e0dde9c25ed..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/QuerySimpleTableColumnVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.simpledb; - -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 QuerySimpleTableColumnVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 数据表所属的数据库名 - */ - @ApiModelProperty(value = "数据表所属的数据库名", required = true) - private String tableSchema; - - /** - * 数据库表名 - */ - @ApiModelProperty(value = "数据库表名", required = true) - @NotBlank(message = "请输入数据库表名！") - private String tableName; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7912e49bcd0b5bcc98d9ee20a08c3d503efc99ab..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/SimpleTableSelectorVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.template.gen.vo.simpledb; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SimpleTableSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ef39e66ddcf3b74313789628ec58c4c12b19d936..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/CollectMenuBo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.auth; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.VoidDto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class CollectMenuBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 路由路径 - */ - @ApiModelProperty("路由路径") - private String path; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index cb7a533a9baf478a8fbf609a6808e742b80cbef4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/ForgetPswUserInfoBo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.auth; - -import com.lframework.starter.web.bo.SuperBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ForgetPswUserInfoBo implements SuperBo { - - /** - * 用户名 - */ - @ApiModelProperty("用户名") - private String username; - - /** - * 邮箱 - */ - @ApiModelProperty("邮箱，脱敏") - private String email; - - /** - * 联系电话 - */ - @ApiModelProperty("联系电话，脱敏") - private String telephone; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bd4e763cee2947d5eb3fae0b2b198a4bc1813571..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.auth; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.inner.dto.LoginDto; -import com.lframework.xingyun.template.inner.dto.LoginDto.UserInfoDto; -import io.swagger.annotations.ApiModelProperty; -import java.util.Set; -import lombok.Data; - -@Data -public class LoginBo extends BaseBo { - - /** - * Token - */ - @ApiModelProperty("Token") - private String token; - - /** - * 用户信息 - */ - @ApiModelProperty("用户信息") - private UserInfoBo user; - - /** - * 角色 - */ - @ApiModelProperty("角色") - private Set roles; - - public LoginBo() { - } - - public LoginBo(LoginDto dto) { - super(dto); - } - - @Override - protected void afterInit(LoginDto dto) { - - this.user = new UserInfoBo(dto.getUser()); - } - - @Data - public static class UserInfoBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - public UserInfoBo() { - } - - public UserInfoBo(UserInfoDto dto) { - super(dto); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index be18b2024a03d8bddffea966693f3541ef4c76f7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/MenuBo.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.auth; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.VoidDto; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import lombok.Data; - -@Data -public class MenuBo extends BaseBo { - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 组件 - */ - @ApiModelProperty("组件") - private String component; - - /** - * 子节点 - */ - @ApiModelProperty("子节点") - private List children; - - /** - * 路由路径 - */ - @ApiModelProperty("路由路径") - private String path; - - /** - * 元数据 - */ - @ApiModelProperty("元数据") - private MetaBo meta; - - public MenuBo() { - } - - @Data - public static class MetaBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 是否隐藏 - */ - @ApiModelProperty("是否隐藏") - private Boolean hideMenu; - - /** - * 是否不缓存 - */ - @ApiModelProperty("是否不缓存") - private Boolean ignoreKeepAlive; - - /** - * 是否固定 - */ - @ApiModelProperty("是否固定") - private Boolean affix = Boolean.FALSE; - - /** - * 是否外部链接 - */ - @ApiModelProperty("是否外部链接") - private Boolean isLink = Boolean.FALSE; - - /** - * 是否收藏 - */ - @ApiModelProperty("是否收藏") - private Boolean isCollect = Boolean.FALSE; - - /** - * 内嵌链接地址 - */ - @ApiModelProperty("内嵌链接地址") - private String frameSrc; - - /** - * 自定义列表ID - */ - @ApiModelProperty("自定义列表ID") - private String customListId; - - /** - * 自定义页面ID - */ - @ApiModelProperty("自定义页面ID") - private String customPageId; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f755f18c36b819d1cc04383feec6909488258ecd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/TelephoneLoginBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.auth; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.inner.dto.LoginDto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 手机号登录Bo - * - * @author zmj - * @since 2022/4/25 - */ -@Data -public class TelephoneLoginBo extends BaseBo { - - /** - * 登录信息 - */ - @ApiModelProperty("登录信息") - private LoginBo loginInfo; - - /** - * 是否绑定用户 - */ - @ApiModelProperty("是否绑定用户") - private Boolean isBind = Boolean.TRUE; - - public TelephoneLoginBo() { - - } - - public TelephoneLoginBo(LoginDto dto) { - - this.afterInit(dto); - } - - @Override - protected void afterInit(LoginDto dto) { - - this.loginInfo = new LoginBo(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index dfde782eefb44867d25a8a601e7adc245b709656..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java +++ /dev/null @@ -1,53 +0,0 @@ -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.core.entity.OpLogs; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class OpLogInUserCenterBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 日志名称 - */ - @ApiModelProperty("日志名称") - private String name; - - /** - * 类别 - */ - @ApiModelProperty("类别") - private Integer logType; - - /** - * IP - */ - @ApiModelProperty("IP") - private String ip; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - public OpLogInUserCenterBo() { - - } - - public OpLogInUserCenterBo(OpLogs dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 61b415b1addc6d39dc5f4f0d6e037a8ab2f392d5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/GetQrtzBo.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.qrtz; - -import com.lframework.xingyun.template.inner.dto.qrtz.QrtzDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import lombok.Data; - -@Data -public class GetQrtzBo extends BaseBo { - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分组 - */ - @ApiModelProperty("分组") - private String group; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private Integer tenantId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 执行类名 - */ - @ApiModelProperty("执行类名") - private String targetClassName; - - /** - * 执行方法名 - */ - @ApiModelProperty("执行方法名") - private String targetMethodName; - - /** - * 执行参数类型 - */ - @ApiModelProperty("执行参数类型") - private List targetParamTypes; - - /** - * 执行参数 - */ - @ApiModelProperty("执行参数") - private List targetParams; - - /** - * 脚本 - */ - @ApiModelProperty("脚本") - private String script; - - /** - * 任务类型 - */ - @ApiModelProperty("任务类型") - private Integer jobType; - - /** - * Cron表达式 - */ - @ApiModelProperty("Cron表达式") - private String cron; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private String state; - - public GetQrtzBo(QrtzDto dto) { - super(dto); - } - - @Override - public BaseBo convert(QrtzDto dto) { - return super.convert(dto, GetQrtzBo::getState); - } - - @Override - protected void afterInit(QrtzDto dto) { - this.jobType = dto.getJobType().getCode(); - if (dto.getState() != null) { - this.state = dto.getState().getCode(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fafda0f6ce1f4ab79fffcb6d48307864eb8c7025..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/QueryQrtzBo.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.qrtz; - -import com.lframework.xingyun.template.inner.dto.qrtz.QrtzDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryQrtzBo extends BaseBo { - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分组 - */ - @ApiModelProperty("分组") - private String group; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 任务类型 - */ - @ApiModelProperty("任务类型") - private Integer jobType; - - /** - * Cron表达式 - */ - @ApiModelProperty("Cron表达式") - private String cron; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private String state; - - public QueryQrtzBo(QrtzDto dto) { - super(dto); - } - - @Override - public BaseBo convert(QrtzDto dto) { - return super.convert(dto, QueryQrtzBo::getState); - } - - @Override - protected void afterInit(QrtzDto dto) { - this.jobType = dto.getJobType().getCode(); - if (dto.getState() != null) { - this.state = dto.getState().getCode(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ffdb1274fcd1b6a519cf42656035006d2557034a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/GetSysDeptBo.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dept; - -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysDeptBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 简称 - */ - @ApiModelProperty("简称") - private String shortName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysDeptBo() { - - } - - public GetSysDeptBo(SysDept dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4506a1d952bf1923b80cc4c96e019c152201d253..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptSelectorBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dept; - -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDeptSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public SysDeptSelectorBo() { - - } - - public SysDeptSelectorBo(SysDept dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a7d6c1aba8c609804060b39268eecdc7898d3606..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptTreeBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dept; - -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDeptTreeBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public SysDeptTreeBo() { - - } - - public SysDeptTreeBo(SysDept dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e1efe780c849e90c54252062d4689a5819fd7702..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysDataDicBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - - public GetSysDataDicBo() { - - } - - public GetSysDataDicBo(SysDataDic dto) { - - super(dto); - } - - @Override - protected void afterInit(SysDataDic dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - SysDataDicCategoryService sysDataDicCategoryService = ApplicationUtil.getBean( - SysDataDicCategoryService.class); - SysDataDicCategory category = sysDataDicCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9708991f1098479295da6cbf8c07b46946fe3b6f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic; - -import com.lframework.starter.common.utils.StringUtil; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySysDataDicBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - - public QuerySysDataDicBo() { - - } - - public QuerySysDataDicBo(SysDataDic dto) { - - super(dto); - } - - @Override - protected void afterInit(SysDataDic dto) { - if (!StringUtil.isBlank(dto.getCategoryId())) { - SysDataDicCategoryService sysDataDicCategoryService = ApplicationUtil.getBean( - SysDataDicCategoryService.class); - SysDataDicCategory category = sysDataDicCategoryService.findById(dto.getCategoryId()); - this.categoryName = category.getName(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 699785fa3a7a7c890b4199afd55c2dc3a83f54b1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/SysDataDicSelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic; - -import com.lframework.xingyun.template.inner.entity.SysDataDic; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDataDicSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public SysDataDicSelectorBo() { - } - - public SysDataDicSelectorBo(SysDataDic dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 092745ccc94bf1f48fc6510110e0511062146db1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/GetSysDataDicCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic.category; - -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysDataDicCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public GetSysDataDicCategoryBo() { - - } - - public GetSysDataDicCategoryBo(SysDataDicCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3af3e9f11aef0b29fd8cc0fbfaabd3c8f9389f1f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/QuerySysDataDicCategoryBo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic.category; - -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySysDataDicCategoryBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - - public QuerySysDataDicCategoryBo() { - - } - - public QuerySysDataDicCategoryBo(SysDataDicCategory dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0a25a2b6fa092ade6735bef810f5f1cd42ddcf83..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/SysDataDicCategorySelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic.category; - -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDataDicCategorySelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public SysDataDicCategorySelectorBo() { - } - - public SysDataDicCategorySelectorBo(SysDataDicCategory dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c9913d2bc578f374fff46139c238bc22df047366..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/GetSysDataDicItemBo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic.item; - -import com.lframework.xingyun.template.inner.entity.SysDataDicItem; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysDataDicItemBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 字典ID - */ - @ApiModelProperty("字典ID") - private String dicId; - - /** - * 排序 - */ - @ApiModelProperty("排序") - private Integer orderNo; - - - public GetSysDataDicItemBo() { - - } - - public GetSysDataDicItemBo(SysDataDicItem dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ada02c776171732daad7a2eb98449466adaebc8b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/QuerySysDataDicItemBo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic.item; - -import com.lframework.xingyun.template.inner.entity.SysDataDicItem; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySysDataDicItemBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 字典ID - */ - @ApiModelProperty("字典ID") - private String dicId; - - /** - * 排序 - */ - @ApiModelProperty("排序") - private Integer orderNo; - - - public QuerySysDataDicItemBo() { - - } - - public QuerySysDataDicItemBo(SysDataDicItem dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d89358e31330b9502eb01a1cfe240648b0de4de1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.dic.item; - -import com.lframework.starter.common.constants.StringPool; -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.utils.ApplicationUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDataDicItemBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - public SysDataDicItemBo() { - - } - - public SysDataDicItemBo(SysDataDicItem dto) { - - super(dto); - } - - @Override - protected void afterInit(SysDataDicItem dto) { - SysDataDicService sysDataDicService = ApplicationUtil.getBean(SysDataDicService.class); - SysDataDic dataDic = sysDataDicService.findById(dto.getDicId()); - this.id = dataDic.getCode() + StringPool.DATA_DIC_SPLIT + this.code; - } -} 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 deleted file mode 100644 index 7aadefeae22892a24d4e4872e3212f33c824ccfa..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/GetSysGenerateCodeBo.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 5d8fb76690f401030be609c82ae3fcfe1de71554..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/QuerySysGenerateCodeBo.java +++ /dev/null @@ -1,45 +0,0 @@ -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-sys/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 deleted file mode 100644 index a0adc6dc2ebda488ff1ed1d42f56c37df7fd3aac..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java +++ /dev/null @@ -1,192 +0,0 @@ -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.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; -import com.lframework.xingyun.template.inner.enums.system.SysMenuComponentType; -import com.lframework.xingyun.template.inner.service.system.SysMenuService; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysMenuBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称（前端使用） - */ - @ApiModelProperty("名称（前端使用）") - private String name; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 组件类型 - */ - @ApiModelProperty("组件类型（前端使用）") - private Integer componentType; - - /** - * 组件（前端使用） - */ - @ApiModelProperty("组件（前端使用）") - private String component; - - /** - * 自定义列表ID - */ - @ApiModelProperty("自定义列表ID") - private String customListId; - - /** - * 自定义列表名称 - */ - @ApiModelProperty("自定义列表名称") - private String customListName; - - /** - * 自定义表单ID - */ - @ApiModelProperty("自定义表单ID") - private String customFormId; - - /** - * 自定义表单名称 - */ - @ApiModelProperty("自定义表单名称") - private String customFormName; - - /** - * 自定义请求参数 - */ - @ApiModelProperty("自定义请求参数") - private String requestParam; - - /** - * 自定义页面ID - */ - @ApiModelProperty("自定义页面ID") - private String customPageId; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 父级名称 - */ - @ApiModelProperty("父级名称") - private String parentName; - - /** - * 路由路径（前端使用） - */ - @ApiModelProperty("路由路径（前端使用）") - private String path; - - /** - * 是否缓存（前端使用） - */ - @ApiModelProperty("是否缓存（前端使用）") - private Boolean noCache; - - /** - * 类型 0-目录 1-菜单 2-功能 - */ - @ApiModelProperty("类型 0-目录 1-菜单 2-功能") - private Integer display; - - /** - * 是否隐藏（前端使用） - */ - @ApiModelProperty("是否隐藏（前端使用）") - private Boolean hidden; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 是否特殊菜单 - */ - @ApiModelProperty("是否特殊菜单") - private Boolean isSpecial; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysMenuBo() { - - } - - public GetSysMenuBo(SysMenu dto) { - - super(dto); - } - - @Override - public BaseBo convert(SysMenu dto) { - - return super.convert(dto, GetSysMenuBo::getDisplay); - } - - @Override - protected void afterInit(SysMenu dto) { - - this.display = dto.getDisplay().getCode(); - if (!StringUtil.isBlank(dto.getParentId())) { - SysMenuService sysMenuService = ApplicationUtil.getBean(SysMenuService.class); - this.parentName = sysMenuService.findById(dto.getParentId()).getTitle(); - } - - this.componentType = dto.getComponentType() == null ? null : dto.getComponentType().getCode(); - if (dto.getComponentType() == SysMenuComponentType.CUSTOM_LIST) { - this.customListId = dto.getComponent(); - GenCustomListService genCustomListService = ApplicationUtil - .getBean(GenCustomListService.class); - GenCustomList customList = genCustomListService.findById(dto.getComponent()); - this.customListName = customList.getName(); - } else if (dto.getComponentType() == SysMenuComponentType.CUSTOM_PAGE) { - this.customPageId = dto.getComponent(); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d78370b21638c0ad229e33c977eeb8e3d6788961..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/QuerySysMenuBo.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.menu; - -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySysMenuBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 类型 - */ - @ApiModelProperty("类型") - private Integer display; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 是否特殊菜单 - */ - @ApiModelProperty("是否特殊菜单") - private Boolean isSpecial; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public QuerySysMenuBo() { - - } - - public QuerySysMenuBo(SysMenu dto) { - - super(dto); - } - - @Override - public BaseBo convert(SysMenu dto) { - - return super.convert(dto, QuerySysMenuBo::getDisplay); - } - - @Override - protected void afterInit(SysMenu dto) { - - this.display = dto.getDisplay().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 430fad707e7c061db81587ec34e0ff8e255125df..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/SysMenuSelectorBo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.menu; - -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysMenuSelectorBo extends BaseBo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - public SysMenuSelectorBo() { - - } - - public SysMenuSelectorBo(SysMenu dto) { - - super(dto); - } -} 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 deleted file mode 100644 index 826e2cd886198b4feaa49710e7e0e754f807af4d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/GetSysMailMessageBo.java +++ /dev/null @@ -1,45 +0,0 @@ -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-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/QuerySysMailMessageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/QuerySysMailMessageBo.java deleted file mode 100644 index 87de2ac03444086eed82914825faaa59338cc2ee..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/QuerySysMailMessageBo.java +++ /dev/null @@ -1,69 +0,0 @@ -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.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 QuerySysMailMessageBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 接收邮箱 - */ - @ApiModelProperty("接收邮箱") - @EncryptConvert(type = EncryType.EMAIL) - private String mail; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 发送状态 - */ - @ApiModelProperty("发送状态") - private Integer sendStatus; - - public QuerySysMailMessageBo() { - - } - - public QuerySysMailMessageBo(SysMailMessage dto) { - - super(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 deleted file mode 100644 index d2fc7a7d6abc9f7f2d40d657a6743cce3b541106..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/GetSysSiteMessageBo.java +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index b88085dc6b0ef1c9955376bc8f003794837ec941..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QueryMySysSiteMessageBo.java +++ /dev/null @@ -1,54 +0,0 @@ -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 deleted file mode 100644 index aa8c9fb4148dc00cdeee1953b08e2c3bc3dd3f79..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QuerySysSiteMessageBo.java +++ /dev/null @@ -1,83 +0,0 @@ -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-sys/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 deleted file mode 100644 index e9ec36195288f8ed857f7c339c649b8473f332ca..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/module/QuerySysModuleBo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.module; - -import com.lframework.xingyun.template.inner.entity.SysModule; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QuerySysModuleBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private Integer id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 是否启用 - */ - @ApiModelProperty("是否启用") - private Boolean enabled; - - /** - * 过期时间 - */ - @ApiModelProperty("过期时间") - private LocalDateTime expireTime; - - public QuerySysModuleBo(SysModule dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b451b0a0929de949c83a6af1522390cc108e9172..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/GetSysNoticeBo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.notice; - -import com.lframework.xingyun.template.inner.entity.SysNotice; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 系统通知 GetBo - *

- * - * @author zmj - */ -@Data -public class GetSysNoticeBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 内容 - */ - @ApiModelProperty("内容") - private String content; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 是否发布 - */ - @ApiModelProperty("是否发布") - private Boolean published; - - public GetSysNoticeBo() { - - } - - public GetSysNoticeBo(SysNotice dto) { - - super(dto); - } - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 13ad41a187d9b2e7ebddb68e9868ea7e5efe0aa1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QueryMySysNoticeBo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.notice; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.xingyun.template.inner.dto.system.notice.QuerySysNoticeByUserDto; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 我的系统通知 QueryBo - *

- * - * @author zmj - */ -@Data -public class QueryMySysNoticeBo 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 publishTime; - - public QueryMySysNoticeBo() { - - } - - public QueryMySysNoticeBo(QuerySysNoticeByUserDto dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b94376bc60d73edbd45ab7579e58e21b6e2b3251..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QuerySysNoticeBo.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.notice; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.xingyun.template.inner.entity.SysNotice; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 系统通知 QueryBo - *

- * - * @author zmj - */ -@Data -public class QuerySysNoticeBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 是否发布 - */ - @ApiModelProperty("是否发布") - private Boolean published; - - /** - * 发布时间 - */ - @ApiModelProperty("发布时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime publishTime; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 已读人数 - */ - @ApiModelProperty("已读人数") - private Integer readedNum; - - /** - * 未读人数 - */ - @ApiModelProperty("未读人数") - private Integer unReadNum; - - public QuerySysNoticeBo() { - - } - - public QuerySysNoticeBo(SysNotice dto) { - - super(dto); - } - - @Override - protected void afterInit(SysNotice dto) { - } -} 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 deleted file mode 100644 index b534902704cda874bb0158606536c525852cf73e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/GetSysNotifyGroupBo.java +++ /dev/null @@ -1,94 +0,0 @@ -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 deleted file mode 100644 index cf4c7dc2472c95251b3f74dc11562b0703862c5e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/QuerySysNotifyGroupBo.java +++ /dev/null @@ -1,98 +0,0 @@ -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-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/SysNotifyGroupSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/SysNotifyGroupSelectorBo.java deleted file mode 100644 index b180f394442917e99ecabe34c712f7309da6f612..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/SysNotifyGroupSelectorBo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.notify; - -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 SysNotifyGroupSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public SysNotifyGroupSelectorBo() { - - } - - public SysNotifyGroupSelectorBo(SysNotifyGroup dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 21db57c70e5b6c4730b86455c4c4ecc0285ce23a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/GetSysOpenDomainBo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.open; - -import com.lframework.xingyun.template.inner.entity.SysOpenDomain; -import com.lframework.starter.web.annotations.convert.EncryptConvert; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysOpenDomainBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * API密钥 - */ - @ApiModelProperty("API密钥") - @EncryptConvert - private String apiSecret; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private Integer tenantId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysOpenDomainBo() { - - } - - public GetSysOpenDomainBo(SysOpenDomain dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1ad6fda18a359991c6d88d81ac85aff3f107027e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/QuerySysOpenDomainBo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.open; - -import com.lframework.xingyun.template.inner.entity.SysOpenDomain; -import com.lframework.starter.web.annotations.convert.EncryptConvert; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySysOpenDomainBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * API密钥 - */ - @ApiModelProperty("API密钥") - @EncryptConvert - private String apiSecret; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private Integer tenantId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public QuerySysOpenDomainBo() { - - } - - public QuerySysOpenDomainBo(SysOpenDomain dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5c94117e44147077f2c888d70de3a331d91b82fb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/SysOpenDomainSelectorBo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.open; - -import com.lframework.xingyun.template.inner.entity.SysOpenDomain; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysOpenDomainSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public SysOpenDomainSelectorBo() { - } - - public SysOpenDomainSelectorBo(SysOpenDomain dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0f728fba1922c50c70b122a0ed44cbf6a095000d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java +++ /dev/null @@ -1,65 +0,0 @@ -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.core.entity.OpLogs; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class GetOpLogBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 日志名称 - */ - @ApiModelProperty("日志名称") - private String name; - - /** - * 类别 - */ - @ApiModelProperty("类别") - private Integer logType; - - /** - * IP地址 - */ - @ApiModelProperty("IP地址") - private String ip; - - /** - * 补充信息 - */ - @ApiModelProperty("补充信息") - private String extra; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - public GetOpLogBo() { - - } - - public GetOpLogBo(OpLogs dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2a5ba7fcf49ab23e3adaea699651f82dc7a9431e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java +++ /dev/null @@ -1,59 +0,0 @@ -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.core.entity.OpLogs; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QueryOpLogBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 日志名称 - */ - @ApiModelProperty("日志名称") - private String name; - - /** - * 类别 - */ - @ApiModelProperty("类别") - private Integer logType; - - /** - * IP地址 - */ - @ApiModelProperty("IP地址") - private String ip; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - public QueryOpLogBo() { - - } - - public QueryOpLogBo(OpLogs dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9c18fc7feab32b6337148d28c3d4bfc2262e5a32..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/GetSysParameterBo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.parameter; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.lframework.xingyun.template.inner.entity.SysParameter; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 系统参数 GetBo - *

- * - * @author zmj - */ -@Data -public class GetSysParameterBo extends BaseBo { - - /** - * ID - */ - @JsonSerialize(using = ToStringSerializer.class) - @ApiModelProperty("ID") - private Long id; - - /** - * 键 - */ - @ApiModelProperty("键") - private String pmKey; - - /** - * 值 - */ - @ApiModelProperty("值") - private String pmValue; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysParameterBo() { - - } - - public GetSysParameterBo(SysParameter dto) { - - super(dto); - } - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6fa695f29b8a26b5087cdd6e0953f9877450b48e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/QuerySysParameterBo.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.parameter; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.xingyun.template.inner.entity.SysParameter; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 系统参数 QueryBo - *

- * - * @author zmj - */ -@Data -public class QuerySysParameterBo extends BaseBo { - - /** - * ID - */ - @JsonSerialize(using = ToStringSerializer.class) - @ApiModelProperty("ID") - private Long id; - - /** - * 键 - */ - @ApiModelProperty("键") - private String pmKey; - - /** - * 值 - */ - @ApiModelProperty("值") - private String pmValue; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - public QuerySysParameterBo() { - - } - - public QuerySysParameterBo(SysParameter dto) { - - super(dto); - } - - @Override - protected void afterInit(SysParameter dto) { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 834d0a8b44e84d1f19c4793c9257bb5b5c1dbadd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/QuerySysDataPermissionModelDetailBo.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.permission; - -import com.lframework.starter.web.annotations.convert.EnumConvert; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.VoidDto; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import lombok.Data; - -@Data -public class QuerySysDataPermissionModelDetailBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private Integer detailId; - - /** - * 节点类型 - */ - @ApiModelProperty("节点类型") - private Integer nodeType; - - /** - * 计算类型 - */ - @ApiModelProperty("计算类型") - private Integer calcType; - - /** - * 值 - */ - @ApiModelProperty("值") - private String value; - - /** - * 值 - */ - @ApiModelProperty("值") - private List values; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 模型ID - */ - @ApiModelProperty("模型ID") - private Integer modelId; - - /** - * 条件 - */ - @ApiModelProperty("条件") - private Integer[] conditionTypes; - - /** - * 输入类型 - */ - @ApiModelProperty("输入类型") - @EnumConvert - private Integer inputType; - - /** - * 条件类型 - */ - @ApiModelProperty("条件类型") - private Integer conditionType; - - /** - * 前段枚举名 - */ - @ApiModelProperty("前端枚举名") - private String enumName; - - /** - * 子节点 - */ - @ApiModelProperty("子节点") - private List children; - - public QuerySysDataPermissionModelDetailBo() { - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b0e00ec6c80345f367f49cc213906314348e15f2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java +++ /dev/null @@ -1,61 +0,0 @@ -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.inner.entity.SysDataPermissionModelDetail; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDataPermissionModelDetailBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private Integer id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 模型ID - */ - @ApiModelProperty("模型ID") - private Integer modelId; - - /** - * 条件 - */ - @ApiModelProperty("条件") - private String[] conditionTypes; - - /** - * 输入类型 - */ - @ApiModelProperty("输入类型") - @EnumConvert - private Integer inputType; - - /** - * 前段枚举名 - */ - @ApiModelProperty("前端枚举名") - private String enumName; - - public SysDataPermissionModelDetailBo() { - } - - public SysDataPermissionModelDetailBo(SysDataPermissionModelDetail dto) { - super(dto); - } - - @Override - protected void afterInit(SysDataPermissionModelDetail dto) { - this.conditionTypes = dto.getConditionType().split(StringPool.STR_SPLIT); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 652f8da12a2b619baf3926588dd759c7965a42be..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.role; - -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysRoleBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysRoleBo() { - - } - - public GetSysRoleBo(SysRole dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fc02d231f1ee8a3fb2d8d5b3958f0378d262fb89..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QueryRoleMenuBo.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.role; - -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryRoleMenuBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 类型 - */ - @ApiModelProperty("类型") - private Integer display; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 是否选择 - */ - @ApiModelProperty("是否选择") - private Boolean selected = Boolean.FALSE; - - public QueryRoleMenuBo() { - - } - - public QueryRoleMenuBo(SysMenu dto) { - - super(dto); - } - - @Override - public BaseBo convert(SysMenu dto) { - - return super.convert(dto, QueryRoleMenuBo::getDisplay); - } - - @Override - protected void afterInit(SysMenu dto) { - - this.display = dto.getDisplay().getCode(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 039f6c1ddb5c01d81a0797de7d52faadae8c32e5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/SysRoleSelectorBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.role; - -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysRoleSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public SysRoleSelectorBo() { - - } - - public SysRoleSelectorBo(SysRole dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c5ab240ba50d61b66252878005fe9c1b6c8c7fd7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/GetTenantBo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.tenant; - -import com.lframework.starter.web.annotations.constants.EncryType; -import com.lframework.xingyun.template.inner.entity.Tenant; -import com.lframework.starter.web.annotations.convert.EncryptConvert; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetTenantBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * JdbcUrl - */ - @ApiModelProperty("JdbcUrl") - @EncryptConvert - private String jdbcUrl; - - /** - * Jdbc用户名 - */ - @ApiModelProperty("Jdbc用户名") - @EncryptConvert - private String jdbcUsername; - - /** - * Jdbc密码 - */ - @ApiModelProperty("Jdbc密码") - @EncryptConvert(type = EncryType.PASSWORD) - private String jdbcPassword; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public GetTenantBo(Tenant dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 198c83b72469e4db418d7a76a0de5d5740d040a9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/QueryTenantBo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.tenant; - -import com.lframework.starter.web.annotations.constants.EncryType; -import com.lframework.xingyun.template.inner.entity.Tenant; -import com.lframework.starter.web.annotations.convert.EncryptConvert; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryTenantBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * JdbcUrl - */ - @ApiModelProperty("JdbcUrl") - @EncryptConvert - private String jdbcUrl; - - /** - * Jdbc用户名 - */ - @ApiModelProperty("Jdbc用户名") - @EncryptConvert - private String jdbcUsername; - - /** - * Jdbc密码 - */ - @ApiModelProperty("Jdbc密码") - @EncryptConvert(type = EncryType.PASSWORD) - private String jdbcPassword; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public QueryTenantBo(Tenant dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ed082f9ec5feae3cb9425337a394536e3d68d781..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/TenantSelectorBo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.tenant; - -import com.lframework.xingyun.template.inner.entity.Tenant; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class TenantSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public TenantSelectorBo() { - - } - - public TenantSelectorBo(Tenant dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 230caf38aaaca360e3a8951ce09a528a93ac8ab4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java +++ /dev/null @@ -1,148 +0,0 @@ -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.SysRole; -import com.lframework.xingyun.template.inner.entity.SysUserDept; -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.SysRoleService; -import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; -import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import lombok.Data; - -@Data -public class GetSysUserBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - /** - * 用户名 - */ - @ApiModelProperty("用户名") - private String username; - - /** - * 邮箱 - */ - @ApiModelProperty("邮箱") - private String email; - - /** - * 联系电话 - */ - @ApiModelProperty("联系电话") - private String telephone; - - /** - * 性别 - */ - @ApiModelProperty("性别") - private Integer gender; - - /** - * 部门 - */ - @ApiModelProperty("部门") - private List depts; - - /** - * 部门名称 - */ - @ApiModelProperty("部门名称") - private String deptName; - - - /** - * 角色 - */ - @ApiModelProperty("角色") - private List roles; - - /** - * 角色名称 - */ - @ApiModelProperty("角色名称") - private String roleName; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 是否锁定 - */ - @ApiModelProperty("是否锁定") - private Boolean lockStatus; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysUserBo() { - - } - - public GetSysUserBo(SysUser dto) { - - super(dto); - } - - @Override - protected void afterInit(SysUser dto) { - SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class); - List userDepts = sysUserDeptService.getByUserId(dto.getId()); - if (!CollectionUtil.isEmpty(userDepts)) { - SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class); - this.depts = userDepts.stream().map(SysUserDept::getDeptId) - .collect(Collectors.toList()); - - this.deptName = StringUtil.join(StringPool.STR_SPLIT_CN, - userDepts.stream().map(t -> sysDeptService.findById(t.getDeptId())) - .filter(Objects::nonNull).map(SysDept::getName) - .collect(Collectors.toList())); - } - - SysUserRoleService sysUserRoleService = ApplicationUtil.getBean(SysUserRoleService.class); - List userRoles = sysUserRoleService.getByUserId(dto.getId()); - if (!CollectionUtil.isEmpty(userRoles)) { - SysRoleService sysRoleService = ApplicationUtil.getBean(SysRoleService.class); - this.roles = userRoles.stream().map(SysUserRole::getRoleId) - .collect(Collectors.toList()); - - this.roleName = StringUtil.join(StringPool.STR_SPLIT_CN, - userRoles.stream().map(t -> sysRoleService.findById(t.getRoleId())) - .filter(Objects::nonNull).map(SysRole::getName) - .collect(Collectors.toList())); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index cb385a9217b830bb8e9e1a0ac1415842ab895269..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.user; - -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.SysRole; -import com.lframework.xingyun.template.inner.entity.SysUserDept; -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.SysRoleService; -import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; -import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; -import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import lombok.Data; - -@Data -public class QuerySysUserBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - /** - * 部门名称 - */ - @ApiModelProperty("部门名称") - private String deptName; - - /** - * 角色名称 - */ - @ApiModelProperty("角色名称") - private String roleName; - - /** - * 用户名 - */ - @ApiModelProperty("用户名") - private String username; - - /** - * 邮箱 - */ - @ApiModelProperty("邮箱") - private String email; - - /** - * 联系电话 - */ - @ApiModelProperty("联系电话") - private String telephone; - - /** - * 性别 - */ - @ApiModelProperty("性别") - private Integer gender; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 是否锁定 - */ - @ApiModelProperty("是否锁定") - private Boolean lockStatus; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 修改人 - */ - @ApiModelProperty("修改人") - private String updateBy; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QuerySysUserBo() { - - } - - public QuerySysUserBo(SysUser dto) { - - super(dto); - } - - @Override - protected void afterInit(SysUser dto) { - SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class); - List userDepts = sysUserDeptService.getByUserId(dto.getId()); - if (!CollectionUtil.isEmpty(userDepts)) { - SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class); - List deptNames = new ArrayList<>(userDepts.size()); - for (SysUserDept userDept : userDepts) { - SysDept dept = sysDeptService.findById(userDept.getDeptId()); - deptNames.add(dept.getName()); - } - - this.deptName = StringUtil.join(StringPool.STR_SPLIT_CN, deptNames); - } - - SysUserRoleService sysUserRoleService = ApplicationUtil.getBean(SysUserRoleService.class); - List userRoles = sysUserRoleService.getByUserId(dto.getId()); - if (!CollectionUtil.isEmpty(userRoles)) { - SysRoleService sysRoleService = ApplicationUtil.getBean(SysRoleService.class); - List roleNames = new ArrayList<>(userRoles.size()); - for (SysUserRole userRole : userRoles) { - SysRole role = sysRoleService.findById(userRole.getRoleId()); - roleNames.add(role.getName()); - } - - this.roleName = StringUtil.join(StringPool.STR_SPLIT_CN, roleNames); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 49095d075c625431c04c6115e6900a03b1a3025e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QueryUserRoleBo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.user; - -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QueryUserRoleBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 是否选中 - */ - @ApiModelProperty("是否选中") - private Boolean selected = Boolean.FALSE; - - public QueryUserRoleBo() { - - } - - public QueryUserRoleBo(SysRole dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 146ab349c7b11165602f688d3b4f29c9b3d2ea5c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.user; - -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysUserSelectorBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - public SysUserSelectorBo() { - - } - - public SysUserSelectorBo(SysUser dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 834854fc48d2133b60a9507ff7021332209f395a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/usercenter/UserInfoBo.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.usercenter; - -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.inner.dto.UserInfoDto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class UserInfoBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 登录名 - */ - @ApiModelProperty("登录名") - private String username; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - /** - * 邮箱 - */ - @ApiModelProperty("邮箱") - private String email; - - /** - * 联系电话 - */ - @ApiModelProperty("联系电话") - private String telephone; - - /** - * 性别 - */ - @ApiModelProperty("性别") - private Integer gender; - - public UserInfoBo() { - - } - - public UserInfoBo(UserInfoDto dto) { - - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 693442e7893ba3111418da45035383d3ea7701ca..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java +++ /dev/null @@ -1,59 +0,0 @@ -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.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; -import java.lang.reflect.Method; -import java.util.List; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.JobExecutionContext; - -/** - * @author zmj - * @since 2022/8/20 - */ -public class DynamicQrtzJob extends QrtzJob { - - @Override - protected void onExecute(JobExecutionContext context) throws Exception { - - JobDetail jobDetail = context.getJobDetail(); - JobDataMap jobDataMap = jobDetail.getJobDataMap(); - QrtzJobType jobType = EnumUtil.getByCode(QrtzJobType.class, jobDataMap.getInt("jobType")); - if (jobType == QrtzJobType.EXCUTE_CLASS) { - String targetClassName = jobDataMap.getString("targetClassName"); - String targetMethodName = jobDataMap.getString("targetMethodName"); - List targetParamTypes = (List) jobDataMap.get("targetParamTypes"); - List targetParams = (List) jobDataMap.get("targetParams"); - - Class clazz = Class.forName(targetClassName); - Object target = ReflectUtil.newInstance(clazz); - Class[] paramTypes = null; - if (!CollectionUtil.isEmpty(targetParamTypes)) { - paramTypes = new Class[targetParamTypes.size()]; - for (int i = 0; i < targetParamTypes.size(); i++) { - String targetParamType = targetParamTypes.get(i); - paramTypes[i] = Class.forName(targetParamType); - } - } - Object[] params = null; - if (!CollectionUtil.isEmpty(targetParams)) { - params = new Object[targetParams.size()]; - for (int i = 0; i < targetParams.size(); i++) { - String targetParamType = targetParams.get(i); - params[i] = targetParamType; - } - } - - Method method = ReflectUtil.getMethod(clazz, targetMethodName, paramTypes); - ReflectUtil.invoke(target, method, params); - } else { - String script = jobDataMap.getString("script"); - GroovyUtil.excuteScript(script); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6d55e2d46e4b45924922f9da0137e82097021335..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.lframework.xingyun.template.inner.config; - -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.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; -import java.util.List; -import org.quartz.JobDetail; -import org.quartz.JobExecutionContext; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -@Component -public class OpLogTimerConfiguration implements ApplicationListener { - - private static final String JOB_NAME = "OP_LOG_TIMER"; - - private static final String JOB_GROUP_NAME = "OP_LOG_TIMER_GROUP"; - - private static final String TRIGGER_NAME = "OP_LOG_TIMER_TRIGGER"; - - private static final String TRIGGER_GROUP_NAME = "OP_LOG_TIMER_TRIGGER_GROUP"; - - @Value("${op-logs.enabled:'true'}") - private Boolean enabled; - - @Override - public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) { - - // 没有使用@Bean的配置方式是因为当enabled==false时，需要移除定时任务 - JobDetail jobDetail = QrtzHandler.getJob(JOB_NAME, JOB_GROUP_NAME); - if (jobDetail == null) { - // 没有任务 - if (!this.enabled) { - return; - } - - QrtzHandler.addJob(JOB_NAME, JOB_GROUP_NAME, OpLogClearJob.class, TRIGGER_NAME, - TRIGGER_GROUP_NAME, - "0 0 * * * ? *"); - } else { - if (!this.enabled) { - QrtzHandler.deleteJob(JOB_NAME, JOB_GROUP_NAME, TRIGGER_NAME, TRIGGER_GROUP_NAME); - } - } - } - - public static class OpLogClearJob extends QrtzJob { - - @Autowired - private OpLogsService opLogsService; - - @Autowired - private TenantService tenantService; - - /** - * 操作日志保留天数 - */ - @Value("${op-logs.retain-days:7}") - private Integer retainDays; - - @Override - public void onExecute(JobExecutionContext context) { - - LocalDateTime now = LocalDateTime.now(); - LocalDateTime endTime = now.minusDays(retainDays); - - if (TenantUtil.enableTenant()) { - List tenants = tenantService.list(); - for (Tenant tenant : tenants) { - TenantContextHolder.setTenantId(tenant.getId()); - opLogsService.clearLogs(endTime); - } - } else { - opLogsService.clearLogs(endTime); - } - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 74e2d47f8a0986e3a6e28f286347ed9fb46f2c90..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java +++ /dev/null @@ -1,623 +0,0 @@ -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; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.exceptions.impl.UserLoginException; -import com.lframework.starter.common.utils.CollectionUtil; -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.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.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.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; -import io.swagger.annotations.ApiOperation; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import javax.imageio.ImageIO; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.FastByteArrayOutputStream; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 默认用户认证Controller - * - * @author zmj - */ -@Api(tags = "用户认证") -@Slf4j -@Validated -@RestController -public class AuthController extends DefaultBaseController { - - @Autowired - private Producer producer; - - @Autowired - private KaptchaProperties kaptchaProperties; - - @Autowired - private RedisHandler redisHandler; - - @Autowired - private CaptchaValidator captchaValidator; - - @Autowired - private PasswordEncoderWrapper passwordEncoderWrapper; - - @Autowired - private SysMenuService sysMenuService; - - @Autowired - private UserDetailsService userDetailsService; - - @Autowired - private SysUserService sysUserService; - - @Autowired - private IUserTokenResolver userTokenResolver; - - @Autowired - private TenantService tenantService; - - @Autowired - private SysDataPermissionDataService sysDataPermissionDataService; - - @Autowired - private SysDataPermissionModelDetailService sysDataPermissionModelDetailService; - - @Autowired - private SysUserRoleService sysUserRoleService; - - @Autowired - private SysUserDeptService sysUserDeptService; - - @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)); - } - - /** - * 获取登录验证码 - */ - @ApiOperation(value = "获取登录验证码") - @OpenApi - @GetMapping("/auth/captcha") - public InvokeResult generateCaptcha() { - - String code = producer.createText(); - BufferedImage image = producer.createImage(code); - - // 转换流信息写出 - FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try { - ImageIO.write(image, "jpg", os); - } catch (IOException e) { - throw new DefaultClientException("验证码生成失败，请稍后重试！"); - } - - String sn = IdUtil.getUUID(); - //将验证码存至redis - redisHandler.set(StringUtil.format(StringPool.LOGIN_CAPTCHA_KEY, sn), code, - kaptchaProperties.getExpireTime() * 60 * 1000L); - - GenerateCaptchaDto resp = new GenerateCaptchaDto(); - resp.setSn(sn); - resp.setImage("data:image/jpeg;base64," + Base64.encode(os.toByteArray())); - - log.debug("获取验证码成功, SN={}, code={}", sn, code); - - return InvokeResultBuilder.success(resp); - } - - @ApiOperation("登录") - @OpenApi - @OpLog(type = DefaultOpLogType.AUTH, name = "用户登录") - @PostMapping("/auth/login") - public InvokeResult login(@Valid LoginVo vo) { - - String username = vo.getUsername(); - String password = vo.getPassword(); - String tenantId = null; - if (TenantUtil.enableTenant()) { - if (StringUtil.isBlank(vo.getTenantName())) { - throw new DefaultClientException("用户名或密码错误！"); - } - - username = vo.getUsername(); - - // 检查租户是否存在 - 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()); - } - - log.info("用户 {} {} 开始登录", tenantId, username); - - 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); - - AbstractUserDetails user = userDetailsService.loadUserByUsername(username); - - LoginDto dto = this.doLogin(user); - - this.addAttributesToSession(user); - - return InvokeResultBuilder.success(new LoginBo(dto)); - } - - @ApiOperation("退出登录") - @OpenApi - @OpLog(type = DefaultOpLogType.AUTH, name = "退出登录") - @PostMapping("/auth/logout") - public InvokeResult logout() { - - StpUtil.logout(); - - return InvokeResultBuilder.success(); - } - - @ApiOperation(value = "获取用户信息") - @GetMapping("/auth/info") - public InvokeResult info() { - - AbstractUserDetails user = getCurrentUser(); - LoginDto info = new LoginDto(null, user.getName(), user.getPermissions()); - - return InvokeResultBuilder.success(new LoginBo(info)); - } - - @ApiOperation("获取用户菜单") - @GetMapping("/auth/menus") - public InvokeResult> menus() { - - AbstractUserDetails user = getCurrentUser(); - // 先查询当前租户使用的module - List moduleIds = null; - if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( - TenantContextHolder.getTenantId()); - } - List menus = sysMenuService.getMenuByUserId(user.getId(), user.isAdmin(), moduleIds); - - // 组装成树形菜单 - List topMenus = menus.stream().filter(t -> StringUtil.isBlank(t.getParentId())) - .collect(Collectors.toList()); - - List results = new ArrayList<>(); - for (MenuDto topMenu : topMenus) { - MenuBo menuBo = new MenuBo(); - menuBo.setName(topMenu.getName()); - menuBo.setComponent("LAYOUT"); - menuBo.setChildren(parseChildrenMenu(topMenu, menus)); - menuBo.setPath(topMenu.getPath()); - - MenuBo.MetaBo meta = new MetaBo(); - meta.setId(topMenu.getId()); - meta.setTitle(topMenu.getMeta().getTitle()); - meta.setIcon(topMenu.getMeta().getIcon()); - meta.setHideMenu(topMenu.getHidden()); - meta.setIgnoreKeepAlive(topMenu.getMeta().getNoCache()); - meta.setIsCollect(topMenu.getIsCollect()); - - menuBo.setMeta(meta); - - results.add(menuBo); - } - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("验证当前登录人的登录密码") - @PostMapping("/auth/check/password") - public InvokeResult checkPassword( - @NotBlank(message = "登录密码不能为空！") String password) { - return InvokeResultBuilder.success(passwordEncoderWrapper.getEncoder() - .matches(password, SecurityUtil.getCurrentUser().getPassword())); - } - - private List parseChildrenMenu(MenuDto topMenu, List menus) { - List children = menus.stream() - .filter(t -> StringUtil.equals(t.getParentId(), topMenu.getId())).map(t -> { - MenuBo menuBo = new MenuBo(); - menuBo.setName(t.getName()); - menuBo.setChildren(parseChildrenMenu(t, menus)); - - menuBo.setComponent(t.getComponent()); - menuBo.setPath( - StringUtil.startWith(t.getPath(), "/") ? t.getPath().substring(1) : t.getPath()); - MenuBo.MetaBo meta = new MetaBo(); - meta.setId(t.getId()); - meta.setTitle(t.getMeta().getTitle()); - meta.setIcon(t.getMeta().getIcon()); - meta.setHideMenu(t.getHidden()); - meta.setIgnoreKeepAlive(t.getMeta().getNoCache()); - meta.setIsCollect(t.getIsCollect()); - if (RegUtil.isMatch(PatternPool.PATTERN_HTTP_URL, menuBo.getPath())) { - meta.setIsLink(Boolean.TRUE); - } - - // 如果是功能 - if (SysMenuDisplay.FUNCTION.getCode().equals(t.getDisplay())) { - // 普通 - if (SysMenuComponentType.NORMAL.getCode().equals(t.getComponentType())) { - if ("/iframes/index".equalsIgnoreCase(t.getComponent())) { - menuBo.setComponent(null); - meta.setFrameSrc(menuBo.getPath().substring(menuBo.getPath().indexOf("?src=") + 5)); - menuBo.setPath(menuBo.getPath().substring(0, menuBo.getPath().indexOf("?src="))); - } - } else if (SysMenuComponentType.CUSTOM_LIST.getCode().equals(t.getComponentType())) { - // 自定义列表 - menuBo.setComponent("CUSTOMLIST"); - meta.setCustomListId(t.getComponent()); - } else if (SysMenuComponentType.CUSTOM_PAGE.getCode().equals(t.getComponentType())) { - // 自定义页面 - menuBo.setComponent("CUSTOMPAGE"); - meta.setCustomPageId(t.getComponent()); - } - } - - menuBo.setMeta(meta); - - return menuBo; - }).collect(Collectors.toList()); - - return children; - } - - @ApiOperation("收藏菜单") - @ApiImplicitParam(value = "菜单ID", name = "menuId", paramType = "query") - @PostMapping("/menu/collect") - public InvokeResult collectMenu(String menuId) { - - AbstractUserDetails user = getCurrentUser(); - sysMenuService.collect(user.getId(), menuId); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("获取已收藏的菜单") - @GetMapping("/menu/collect") - public InvokeResult> getCollectMenus() { - AbstractUserDetails user = getCurrentUser(); - // 先查询当前租户使用的module - List moduleIds = null; - if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( - TenantContextHolder.getTenantId()); - } - List menus = sysMenuService.getMenuByUserId(user.getId(), user.isAdmin(), moduleIds); - - 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()); - result.setTitle(t.getMeta().getTitle()); - result.setIcon(t.getMeta().getIcon()); - if (StringUtil.isBlank(result.getIcon())) { - // 如果没有图标 那么就往上级找 - String icon = null; - String parentId = t.getParentId(); - while (StringUtil.isNotEmpty(parentId)) { - MenuDto parentMenu = null; - for (MenuDto m : menus) { - if (m.getId().equals(parentId)) { - parentMenu = m; - } - } - - if (parentMenu == null) { - break; - } - - if (StringUtil.isNotBlank(parentMenu.getMeta().getIcon())) { - icon = parentMenu.getMeta().getIcon(); - break; - } - - parentId = parentMenu.getParentId(); - } - result.setIcon(icon); - } - - List pathList = new ArrayList<>(); - pathList.add(t.getPath()); - String parentId = t.getParentId(); - while (StringUtil.isNotEmpty(parentId)) { - MenuDto parentMenu = null; - for (MenuDto m : menus) { - if (m.getId().equals(parentId)) { - parentMenu = m; - } - } - - if (parentMenu == null) { - break; - } - - if (StringUtil.isNotBlank(parentMenu.getPath())) { - pathList.add(parentMenu.getPath()); - } - - parentId = parentMenu.getParentId(); - } - - pathList = CollectionUtil.reverse(pathList); - result.setPath(CollectionUtil.join(pathList, "")); - - return result; - }).collect(Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("取消收藏菜单") - @ApiImplicitParam(value = "菜单ID", name = "menuId", paramType = "query") - @PostMapping("/menu/collect/cancel") - public InvokeResult cancelCollectMenu(String menuId) { - - AbstractUserDetails user = getCurrentUser(); - sysMenuService.cancelCollect(user.getId(), menuId); - - return InvokeResultBuilder.success(); - } - - private LoginDto doLogin(AbstractUserDetails user) { - - if (!user.isAccountNonExpired()) { - throw new UserLoginException("账户已过期，不允许登录！"); - } - - if (!user.isAccountNonLocked()) { - throw new UserLoginException("账户已过期，不允许登录！"); - } - - if (!user.isAccountNonLocked()) { - throw new UserLoginException("账户已锁定，不允许登录！"); - } - - if (!user.isEnabled()) { - throw new UserLoginException("账户已停用，不允许登录！"); - } - - if (user.isNoPermission()) { - throw new UserLoginException("账户未授权，不允许登录！"); - } - // 登录 - // loginId需要唯一 - String loginId = - (user.getTenantId() == null ? "" : user.getTenantId() + "@") + user.getUsername() + "@" - + IdUtil.getUUID(); - - StpUtil.login(loginId); - - user.setLoginId(loginId); - - StpUtil.getSession().set(SecurityConstants.USER_INFO_KEY, user); - - String token = userTokenResolver.getToken(); - - return new LoginDto(token, user.getName(), user.getPermissions()); - } - - private void checkUserLogin(Integer tenantId, String username, String password) { - AbstractUserDetails user = userDetailsService.loadUserByUsername(username); - String lockKey = - (tenantId == null ? "noTenant" : tenantId) + "_" + username + "_" + DateUtil.formatDate( - LocalDate.now()) + "_LOGIN_LOCK"; - if (!passwordEncoderWrapper.getEncoder().matches(password, user.getPassword())) { - long loginErrorNum = redisHandler.incr(lockKey, 1); - redisHandler.expire(lockKey, 86400000L); - int failNum = 5; - if (loginErrorNum < failNum) { - throw new UserLoginException( - "您已经登录失败" + loginErrorNum + "次，您还可以尝试" + (failNum - loginErrorNum) - + "次！"); - } else { - sysUserService.lockById(user.getId()); - - sysUserService.cleanCacheByKey(user.getId()); - - redisHandler.expire(lockKey, 1L); - // 锁定用户 - throw new UserLoginException("用户已锁定，无法登录！"); - } - } else { - redisHandler.expire(lockKey, 1L); - } - } - - protected void addAttributesToSession(AbstractUserDetails user) { - Map dataPermissionMap = new HashMap<>(); - SysDataPermissionDataPermissionType[] permissionTypes = SysDataPermissionDataPermissionType.values(); - for (SysDataPermissionDataPermissionType permissionType : permissionTypes) { - List sqlTemplates = new ArrayList<>(); - - List userRoles = sysUserRoleService.getByUserId(user.getId()); - if (CollectionUtil.isNotEmpty(userRoles)) { - for (SysUserRole userRole : userRoles) { - SysDataPermissionData permissionData = sysDataPermissionDataService.getByBizId( - userRole.getRoleId(), - SysDataPermissionDataBizType.ROLE.getCode(), permissionType.getCode()); - if (permissionData != null) { - String sqlTemplate = sysDataPermissionModelDetailService.toSql( - JsonUtil.parseList(permissionData.getPermission(), - SysDataPermissionModelDetailVo.class)); - if (StringUtil.isNotBlank(sqlTemplate)) { - sqlTemplates.add(sqlTemplate); - } - } - } - } - - List userDepts = sysUserDeptService.getByUserId(user.getId()); - if (CollectionUtil.isNotEmpty(userDepts)) { - for (SysUserDept userDept : userDepts) { - SysDataPermissionData permissionData = sysDataPermissionDataService.getByBizId( - userDept.getDeptId(), - SysDataPermissionDataBizType.DEPT.getCode(), permissionType.getCode()); - if (permissionData != null) { - String sqlTemplate = sysDataPermissionModelDetailService.toSql( - JsonUtil.parseList(permissionData.getPermission(), - SysDataPermissionModelDetailVo.class)); - if (StringUtil.isNotBlank(sqlTemplate)) { - sqlTemplates.add(sqlTemplate); - } - } - } - } - - SysDataPermissionData permissionData = sysDataPermissionDataService.getByBizId( - user.getId(), - SysDataPermissionDataBizType.USER.getCode(), permissionType.getCode()); - if (permissionData != null) { - String sqlTemplate = sysDataPermissionModelDetailService.toSql( - JsonUtil.parseList(permissionData.getPermission(), - SysDataPermissionModelDetailVo.class)); - if (StringUtil.isNotBlank(sqlTemplate)) { - sqlTemplates.add(sqlTemplate); - } - } - - if (CollectionUtil.isNotEmpty(sqlTemplates)) { - dataPermissionMap.put(permissionType.getCode().toString(), - "(" + CollectionUtil.join(sqlTemplates, " AND ") + ")"); - } - } - - StpUtil.getSession().set(SecurityConstants.DATA_PERMISSION_SQL_MAP, dataPermissionMap); - - Map dataPermissionVar = new HashMap<>(); - List userDepts = sysUserDeptService.getByUserId(user.getId()); - List curDeptIds = userDepts.stream().map(SysUserDept::getDeptId) - .map(t -> "'" + t + "'").collect( - Collectors.toList()); - dataPermissionVar.put("curDeptIds", - CollectionUtil.isEmpty(curDeptIds) ? IdUtil.getId() : CollectionUtil.join(curDeptIds, ",")); - - StpUtil.getSession().set(SecurityConstants.DATA_PERMISSION_SQL_VAR, dataPermissionVar); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 91786708f52979ba1934fd88f73c93c9fc6a625a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/QrtzController.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.lframework.xingyun.template.inner.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.xingyun.template.inner.bo.qrtz.GetQrtzBo; -import com.lframework.xingyun.template.inner.bo.qrtz.QueryQrtzBo; -import com.lframework.xingyun.template.inner.service.QrtzService; -import com.lframework.xingyun.template.inner.vo.qrtz.CreateQrtzVo; -import com.lframework.xingyun.template.inner.vo.qrtz.QueryQrtzVo; -import com.lframework.xingyun.template.inner.vo.qrtz.UpdateQrtzVo; -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.template.inner.dto.qrtz.QrtzDto; -import io.swagger.annotations.Api; -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 com.lframework.starter.web.annotations.security.HasPermission; -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; - -@Api(tags = "定时器管理") -@RestController -@RequestMapping("/qrtz") -public class QrtzController extends DefaultBaseController { - - @Autowired - private QrtzService qrtzService; - - /** - * 查询列表 - * - * @param vo - * @return - */ - @ApiOperation("查询列表") - @HasPermission({"development:qrtz:manage"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QueryQrtzVo vo) { - - PageResult pageResult = qrtzService.query(getPageIndex(vo), getPageSize(vo), vo); - List datas = pageResult.getDatas(); - - List results = null; - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryQrtzBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 查询 - * - * @return - */ - @ApiOperation("查询") - @HasPermission({"development:qrtz:manage"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "名称不能为空！") String name, - @NotBlank(message = "组不能为空！") String group) { - QrtzDto data = qrtzService.findById(name, group); - if (data == null) { - throw new DefaultClientException("任务不存在！"); - } - - return InvokeResultBuilder.success(new GetQrtzBo(data)); - } - - /** - * 创建 - * - * @param vo - * @return - */ - @ApiOperation("创建") - @HasPermission({"development:qrtz:manage"}) - @PostMapping - public InvokeResult create(@Valid @RequestBody CreateQrtzVo vo) { - qrtzService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改 - * - * @param vo - * @return - */ - @ApiOperation("修改") - @HasPermission({"development:qrtz:manage"}) - @PutMapping - public InvokeResult update(@Valid @RequestBody UpdateQrtzVo vo) { - qrtzService.update(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 暂停 - * - * @return - */ - @ApiOperation("暂停") - @HasPermission({"development:qrtz:manage"}) - @PutMapping("/pause") - public InvokeResult pause(@NotBlank(message = "名称不能为空！") String name, - @NotBlank(message = "组不能为空！") String group) { - qrtzService.pause(name, group); - - return InvokeResultBuilder.success(); - } - - /** - * 恢复 - * - * @return - */ - @ApiOperation("恢复") - @HasPermission({"development:qrtz:manage"}) - @PutMapping("/resume") - public InvokeResult resume(@NotBlank(message = "名称不能为空！") String name, - @NotBlank(message = "组不能为空！") String group) { - qrtzService.resume(name, group); - - return InvokeResultBuilder.success(); - } - - /** - * 触发 - * - * @return - */ - @ApiOperation("触发") - @HasPermission({"development:qrtz:manage"}) - @PutMapping("/trigger") - public InvokeResult trigger(@NotBlank(message = "名称不能为空！") String name, - @NotBlank(message = "组不能为空！") String group) { - qrtzService.trigger(name, group); - - return InvokeResultBuilder.success(); - } - - /** - * 删除 - * - * @return - */ - @ApiOperation("删除") - @HasPermission({"development:qrtz:manage"}) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "名称不能为空！") String name, - @NotBlank(message = "组不能为空！") String group) { - qrtzService.delete(name, group); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f44d6e3fc54924a9defca5705a87b93721f5f797..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.lframework.xingyun.template.inner.controller; - -import com.lframework.starter.common.constants.PatternPool; -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.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 io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -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.PatchMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户中心 - * - * @author zmj - */ -@Api(tags = "个人中心") -@Validated -@RestController -@RequestMapping("/center") -public class UserCenterController extends DefaultBaseController { - - @Autowired - private SysUserService sysUserService; - - @Autowired - private OpLogsService opLogsService; - - @Autowired - private PasswordEncoderWrapper encoderWrapper; - - /** - * 获取用户信息 - */ - @ApiOperation(value = "获取用户信息") - @GetMapping("/info") - public InvokeResult getInfo() { - - String userId = getCurrentUser().getId(); - UserInfoDto info = sysUserService.getInfo(userId); - - return InvokeResultBuilder.success(new UserInfoBo(info)); - } - - /** - * 修改密码 - */ - @ApiOperation("修改密码") - @ApiImplicitParams({ - @ApiImplicitParam(value = "旧密码", name = "oldPsw", paramType = "query", required = true), - @ApiImplicitParam(value = "新密码", name = "newPsw", paramType = "query", required = true), - @ApiImplicitParam(value = "确认密码", name = "confirmPsw", paramType = "query", required = true)}) - @OpLog(type = DefaultOpLogType.AUTH, name = "修改密码，原密码：{}，新密码：{}", params = {"#oldPsw", "#newPsw"}) - @PatchMapping("/password") - public InvokeResult updatePassword(@NotBlank(message = "旧密码不能为空！") String oldPsw, - @NotBlank(message = "新密码不能为空！") String newPsw, - @NotBlank(message = "确认密码不能为空！") String confirmPsw) { - - AbstractUserDetails user = getCurrentUser(); - if (!encoderWrapper.getEncoder().matches(oldPsw, user.getPassword())) { - throw new InputErrorException("旧密码不正确，请重新输入！"); - } - - if (!StringUtil.equals(newPsw, confirmPsw)) { - throw new InputErrorException("两次密码输入不一致，请检查！"); - } - - if (!RegUtil.isMatch(PatternPool.PATTERN_PASSWORD, newPsw)) { - throw new InputErrorException("密码格式不正确，请检查！"); - } - - sysUserService.updatePassword(user.getId(), newPsw); - - //修改密码后，退出登录状态 - SecurityUtil.logout(); - - return InvokeResultBuilder.success(); - } - - /** - * 修改邮箱 - */ - @ApiOperation("修改邮箱") - @ApiImplicitParams({ - @ApiImplicitParam(value = "新邮箱地址", name = "newEmail", paramType = "query", required = true), - @ApiImplicitParam(value = "确认邮箱地址", name = "confirmEmail", paramType = "query", required = true)}) - @OpLog(type = DefaultOpLogType.AUTH, name = "修改邮箱，新邮箱：{}", params = "#newEmail") - @PatchMapping("/email") - public InvokeResult updateEmail(@NotBlank(message = "新邮箱地址不能为空！") String newEmail, - @NotBlank(message = "确认邮箱地址不能为空！") String confirmEmail) { - - AbstractUserDetails user = getCurrentUser(); - - if (!StringUtil.equals(newEmail, confirmEmail)) { - throw new InputErrorException("两次邮箱地址输入不一致，请检查！"); - } - - if (!RegUtil.isMatch(PatternPool.EMAIL, newEmail)) { - throw new InputErrorException("邮箱地址格式不正确，请检查！"); - } - - sysUserService.updateEmail(user.getId(), newEmail); - - sysUserService.cleanCacheByKey(user.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 修改联系电话 - */ - @ApiOperation("修改联系电话") - @ApiImplicitParams({ - @ApiImplicitParam(value = "新联系电话", name = "newTelephone", paramType = "query", required = true), - @ApiImplicitParam(value = "确认联系电话", name = "confirmTelephone", paramType = "query", required = true)}) - @OpLog(type = DefaultOpLogType.AUTH, name = "修改联系电话，新联系电话：{}", params = "#newTelephone") - @PatchMapping("/telephone") - public InvokeResult updateTelephone(@NotBlank(message = "新联系电话不能为空！") String newTelephone, - @NotBlank(message = "确认联系电话不能为空！") String confirmTelephone) { - - AbstractUserDetails user = getCurrentUser(); - - if (!StringUtil.equals(newTelephone, confirmTelephone)) { - throw new InputErrorException("两次联系电话输入不一致，请检查！"); - } - - if (!RegUtil.isMatch(PatternPool.PATTERN_CN_TEL, newTelephone)) { - throw new InputErrorException("联系电话格式不正确，请检查！"); - } - - sysUserService.updateTelephone(user.getId(), newTelephone); - - sysUserService.cleanCacheByKey(user.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 查询操作日志 - */ - @ApiOperation("查询操作日志") - @GetMapping("/oplog") - public InvokeResult> oplog(@Valid QueryOpLogsVo vo) { - - vo.setCreateBy(SecurityUtil.getCurrentUser().getId()); - - PageResult pageResult = opLogsService.query(getPageIndex(vo), getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(OpLogInUserCenterBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d64a27998935b664605f18e81ee6d28f2f213b97..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java +++ /dev/null @@ -1,394 +0,0 @@ -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.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.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.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.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.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 io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import javax.validation.Valid; -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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据选择器 - * - * @author zmj - */ -@Api(tags = "数据选择器") -@Validated -@RestController -@RequestMapping("/selector") -public class DefaultSysSelectorController extends DefaultBaseController { - - @Autowired - private SysUserService sysUserService; - - @Autowired - private SysMenuService sysMenuService; - - @Autowired - private SysDeptService sysDeptService; - - @Autowired - private SysRoleService sysRoleService; - - @Autowired - private SysDataDicCategoryService sysDataDicCategoryService; - - @Autowired - private SysDataDicService sysDataDicService; - - @Autowired - private SysOpenDomainService sysOpenDomainService; - - @Autowired - private TenantService tenantService; - - @Autowired - private SysModuleTenantService sysModuleTenantService; - - @Autowired - private SysNotifyGroupService sysNotifyGroupService; - - /** - * 系统菜单 - */ - @ApiOperation("系统菜单") - @GetMapping("/menu") - public InvokeResult> menu(@Valid SysMenuSelectorVo vo) { - - // 先查询当前租户使用的module - List moduleIds = null; - if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( - TenantContextHolder.getTenantId()); - } - - List results = CollectionUtil.emptyList(); - List datas = sysMenuService.selector(vo, moduleIds); - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(SysMenuSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("部门") - @GetMapping("/dept") - public InvokeResult> dept() { - - List results = CollectionUtil.emptyList(); - List datas = sysDeptService.selector(); - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(SysDeptSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("角色") - @GetMapping("/role") - public InvokeResult> role(@Valid SysRoleSelectorVo vo) { - - PageResult pageResult = sysRoleService.selector(getPageIndex(vo), getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(SysRoleSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载角色 - */ - @ApiOperation("加载角色") - @PostMapping("/role/load") - public InvokeResult> loadRole( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - 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()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("租户") - @GetMapping("/tenant") - public InvokeResult> tenant(@Valid TenantSelectorVo vo) { - - PageResult pageResult = tenantService.selector(getPageIndex(vo), getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(TenantSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载租户 - */ - @ApiOperation("加载租户") - @PostMapping("/tenant/load") - public InvokeResult> loadTenant( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - 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()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("用户") - @GetMapping("/user") - public InvokeResult> user(@Valid SysUserSelectorVo vo) { - - PageResult pageResult = sysUserService.selector(getPageIndex(vo), getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(SysUserSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载用户 - */ - @ApiOperation("加载用户") - @PostMapping("/user/load") - public InvokeResult> loadUser( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - 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("/dic/category") - public InvokeResult> dataDicCategory( - @Valid SysDataDicCategorySelectorVo vo) { - - PageResult pageResult = sysDataDicCategoryService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(SysDataDicCategorySelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据字典分类 - */ - @ApiOperation("加载数据字典分类") - @PostMapping("/dic/category/load") - public InvokeResult> loadDataDicCategory( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> sysDataDicCategoryService.findById(t)).filter(Objects::nonNull) - .collect(Collectors.toList()); - List results = datas.stream() - .map(SysDataDicCategorySelectorBo::new).collect(Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("数据字典") - @GetMapping("/dic") - public InvokeResult> dataDic(@Valid SysDataDicSelectorVo vo) { - - PageResult pageResult = sysDataDicService.selector(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(SysDataDicSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载数据字典 - */ - @ApiOperation("加载数据字典") - @PostMapping("/dic/load") - public InvokeResult> loadDataDic( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - 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()); - - return InvokeResultBuilder.success(results); - } - - /** - * 开放域 - */ - @ApiOperation("开放域") - @GetMapping("/openDomain") - public InvokeResult> openDomain( - @Valid SysOpenDomainSelectorVo vo) { - - PageResult pageResult = sysOpenDomainService.selector(vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(SysOpenDomainSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载开放域 - */ - @ApiOperation("加载开放域") - @PostMapping("/openDomain/load") - public InvokeResult> openDomain( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(Objects::nonNull) - .map(t -> sysOpenDomainService.findById(t)).filter(Objects::nonNull) - .collect(Collectors.toList()); - List results = datas.stream().map(SysOpenDomainSelectorBo::new) - .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-sys/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 deleted file mode 100644 index 5bc14ac170821625139867fdde2463a7ff6c56c8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java +++ /dev/null @@ -1,83 +0,0 @@ -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.xingyun.template.inner.bo.system.oplog.GetOpLogBo; -import com.lframework.xingyun.template.inner.bo.system.oplog.QueryOpLogBo; -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; -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; - -/** - * 操作日志 - * - * @author zmj - */ -@Api(tags = "操作日志") -@Validated -@RestController -@RequestMapping("/system/oplog") -public class OpLogController extends DefaultBaseController { - - @Autowired - private OpLogsService opLogsService; - - /** - * 操作日志列表 - */ - @ApiOperation("操作日志列表") - @HasPermission({"system:oplog:query"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QueryOpLogsVo vo) { - - PageResult pageResult = opLogsService.query(getPageIndex(vo), getPageSize(vo), - vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryOpLogBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 操作日志详情 - */ - @ApiOperation("操作日志详情") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:oplog:query"}) - @GetMapping - public InvokeResult findById(@NotBlank(message = "ID不能为空") String id) { - - OpLogs data = opLogsService.findById(id); - - if (data == null) { - throw new DefaultClientException("操作日志不存在！"); - } - - GetOpLogBo result = new GetOpLogBo(data); - - return InvokeResultBuilder.success(result); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c8e97bf45572609640e31862be61bc4011a100d8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicCategoryController.java +++ /dev/null @@ -1,122 +0,0 @@ -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.bo.system.dic.category.QuerySysDataDicCategoryBo; -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -import com.lframework.xingyun.template.inner.service.system.SysDataDicCategoryService; -import com.lframework.xingyun.template.inner.vo.system.dic.category.CreateSysDataDicCategoryVo; -import com.lframework.xingyun.template.inner.vo.system.dic.category.UpdateSysDataDicCategoryVo; -import com.lframework.xingyun.template.inner.bo.system.dic.category.GetSysDataDicCategoryBo; -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 java.util.Arrays; -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 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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据字典分类 - * - * @author zmj - */ -@Api(tags = "数据字典分类") -@Validated -@RestController -@RequestMapping("/system/dic/category") -public class SysDataDicCategoryController extends DefaultBaseController { - - @Autowired - private SysDataDicCategoryService sysDataDicCategoryService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:dic-category:*"}) - @GetMapping("/query") - public InvokeResult> query() { - List datas = sysDataDicCategoryService.queryList(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysDataDicCategoryBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:dic-category:*"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysDataDicCategory data = sysDataDicCategoryService.findById(id); - if (data == null) { - throw new DefaultClientException("数据字典分类不存在！"); - } - - GetSysDataDicCategoryBo result = new GetSysDataDicCategoryBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增数据字典分类 - */ - @ApiOperation("新增数据字典分类") - @HasPermission({"system:dic-category:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysDataDicCategoryVo vo) { - - sysDataDicCategoryService.create(vo); - - sysDataDicCategoryService.cleanCacheByKey("all"); - - return InvokeResultBuilder.success(); - } - - /** - * 修改数据字典分类 - */ - @ApiOperation("修改数据字典分类") - @HasPermission({"system:dic-category:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysDataDicCategoryVo vo) { - - sysDataDicCategoryService.update(vo); - - sysDataDicCategoryService.cleanCacheByKeys(Arrays.asList("all", vo.getId())); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("删除数据字典分类") - @HasPermission({"system:dic-category:delete"}) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - sysDataDicCategoryService.deleteById(id); - - sysDataDicCategoryService.cleanCacheByKeys(Arrays.asList("all", id)); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 30b727e8b93e52a7cf37a35177f8ad914d1b26e9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicController.java +++ /dev/null @@ -1,127 +0,0 @@ -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.bo.system.dic.GetSysDataDicBo; -import com.lframework.xingyun.template.inner.bo.system.dic.QuerySysDataDicBo; -import com.lframework.xingyun.template.inner.entity.SysDataDic; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -import com.lframework.xingyun.template.inner.vo.system.dic.CreateSysDataDicVo; -import com.lframework.xingyun.template.inner.vo.system.dic.QuerySysDataDicVo; -import com.lframework.xingyun.template.inner.vo.system.dic.UpdateSysDataDicVo; -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 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 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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据字典 - * - * @author zmj - */ -@Api(tags = "数据字典") -@Validated -@RestController -@RequestMapping("/system/dic") -public class SysDataDicController extends DefaultBaseController { - - @Autowired - private SysDataDicService sysDataDicService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:dic:*"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysDataDicVo vo) { - PageResult pageResult = sysDataDicService.query(getPageIndex(vo), getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysDataDicBo::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:dic:*"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysDataDic data = sysDataDicService.findById(id); - if (data == null) { - throw new DefaultClientException("数据字典不存在！"); - } - - GetSysDataDicBo result = new GetSysDataDicBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增数据字典 - */ - @ApiOperation("新增数据字典") - @HasPermission({"system:dic:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysDataDicVo vo) { - - sysDataDicService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改数据字典 - */ - @ApiOperation("修改数据字典") - @HasPermission({"system:dic:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysDataDicVo vo) { - - sysDataDicService.update(vo); - - sysDataDicService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 删除数据字典 - */ - @ApiOperation("删除数据字典") - @HasPermission({"system:dic:delete"}) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - sysDataDicService.deleteById(id); - - sysDataDicService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b567a50756bce7ffd5c21e90366d4f611bae32fe..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicItemController.java +++ /dev/null @@ -1,162 +0,0 @@ -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.SysDataDic; -import com.lframework.xingyun.template.inner.entity.SysDataDicItem; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysDataDicItemService; -import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -import com.lframework.xingyun.template.inner.vo.system.dic.item.CreateSysDataDicItemVo; -import com.lframework.xingyun.template.inner.vo.system.dic.item.QuerySysDataDicItemVo; -import com.lframework.xingyun.template.inner.vo.system.dic.item.UpdateSysDataDicItemVo; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.inner.bo.system.dic.item.GetSysDataDicItemBo; -import com.lframework.xingyun.template.inner.bo.system.dic.item.QuerySysDataDicItemBo; -import com.lframework.xingyun.template.inner.bo.system.dic.item.SysDataDicItemBo; -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 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 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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据字典值 - * - * @author zmj - */ -@Api(tags = "数据字典值") -@Validated -@RestController -@RequestMapping("/system/dic/item") -public class SysDataDicItemController extends DefaultBaseController { - - @Autowired - private SysDataDicItemService sysDataDicItemService; - - @Autowired - private SysDataDicService sysDataDicService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:dic-item:*"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysDataDicItemVo vo) { - PageResult pageResult = sysDataDicItemService.query(getPageIndex(vo), - getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = CollectionUtil.emptyList(); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysDataDicItemBo::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:dic-item:*"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysDataDicItem data = sysDataDicItemService.findById(id); - if (data == null) { - throw new DefaultClientException("数据字典值不存在！"); - } - - GetSysDataDicItemBo result = new GetSysDataDicItemBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 根据字典编号查询 - */ - @ApiOperation("根据字典编号查询") - @ApiImplicitParam(value = "字典编号", name = "code", paramType = "query", required = true) - @GetMapping("/bydic") - public InvokeResult> getByDicCode( - @NotBlank(message = "字典编号不能为空！") String code) { - List datas = sysDataDicItemService.findByDicCode(code); - - List results = datas.stream().map(SysDataDicItemBo::new) - .collect(Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - /** - * 新增数据字典值 - */ - @ApiOperation("新增数据字典值") - @HasPermission({"system:dic-item:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysDataDicItemVo vo) { - - sysDataDicItemService.create(vo); - - SysDataDic dic = sysDataDicService.findById(vo.getDicId()); - sysDataDicItemService.cleanCacheByKey(dic.getCode()); - - return InvokeResultBuilder.success(); - } - - /** - * 修改数据字典值 - */ - @ApiOperation("修改数据字典值") - @HasPermission({"system:dic-item:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysDataDicItemVo vo) { - - SysDataDicItem item = sysDataDicItemService.findById(vo.getId()); - - sysDataDicItemService.update(vo); - - SysDataDic dic = sysDataDicService.findById(item.getDicId()); - sysDataDicItemService.cleanCacheByKey(dic.getCode()); - - sysDataDicItemService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 删除数据字典值 - */ - @ApiOperation("删除数据字典值") - @HasPermission({"system:dic-item:delete"}) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - SysDataDicItem item = sysDataDicItemService.findById(id); - - sysDataDicItemService.deleteById(id); - - SysDataDic dic = sysDataDicService.findById(item.getDicId()); - sysDataDicItemService.cleanCacheByKey(dic.getCode()); - - sysDataDicItemService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1bfc4ed73515c78a0f0258cda67da7cda9825522..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java +++ /dev/null @@ -1,94 +0,0 @@ -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.vo.system.permission.CreateSysDataPermissionDataVo; -import com.lframework.xingyun.template.inner.entity.SysRole; -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.components.security.SecurityConstants; -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.IdUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import javax.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据权限数据 - * - * @author zmj - */ -@Api(tags = "数据权限数据") -@Validated -@RestController -@RequestMapping("/system/data/permission/data") -public class SysDataPermissionDataController extends DefaultBaseController { - - @Autowired - private SysDataPermissionDataService sysDataPermissionDataService; - - @Autowired - private SysRoleService sysRoleService; - - @ApiOperation("保存") - @PostMapping - public InvokeResult save(@Valid @RequestBody List data) { - if (CollectionUtil.isEmpty(data)) { - return InvokeResultBuilder.success(); - } - - for (CreateSysDataPermissionDataVo vo : data) { - if (EnumUtil.getByCode(SysDataPermissionDataBizType.class, vo.getBizType()) - == SysDataPermissionDataBizType.ROLE) { - List roles = vo.getBizIds().stream().map(t -> sysRoleService.findById(t)) - .filter( - Objects::nonNull) - .filter(t -> SecurityConstants.PERMISSION_ADMIN_NAME.equals(t.getPermission())) - .collect(Collectors.toList()); - - if (CollectionUtil.isNotEmpty(roles)) { - throw new DefaultClientException( - "权限【" + SecurityConstants.PERMISSION_ADMIN_NAME - + "】为内置权限，不允许设置数据权限！"); - } - } - } - - List records = data.stream() - .flatMap(t -> t.getBizIds().stream() - .map(bizId -> { - SysDataPermissionData record = sysDataPermissionDataService.getByBizId(bizId, - t.getBizType(), - t.getPermissionType()); - if (record == null) { - record = new SysDataPermissionData(); - record.setId(IdUtil.getId()); - record.setBizId(bizId); - record.setBizType( - EnumUtil.getByCode(SysDataPermissionDataBizType.class, t.getBizType())); - record.setPermissionType(t.getPermissionType()); - } - record.setPermission(t.getPermission()); - return record; - })) - .collect(Collectors.toList()); - - sysDataPermissionDataService.saveOrUpdateAllColumnBatch(records); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9f1cde8bdd61859d0fa93ef538f9c198e2aecf21..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.lframework.xingyun.template.inner.controller.system; - -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.utils.CollectionUtil; -import com.lframework.starter.web.components.validation.IsEnum; -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.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.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; -import io.swagger.annotations.ApiOperation; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 数据权限Model明细 - * - * @author zmj - */ -@Api(tags = "数据权限Model明细") -@Validated -@RestController -@RequestMapping("/system/data/permission/model/detail") -public class SysDataPermissionModelDetailController extends DefaultBaseController { - - @Autowired - private SysDataPermissionModelDetailService sysDataPermissionModelDetailService; - - @Autowired - private SysDataPermissionDataService sysDataPermissionDataService; - - @ApiOperation("根据模型ID查询") - @ApiImplicitParam(value = "模型ID", name = "modelId", paramType = "query", required = true) - @GetMapping - public InvokeResult> getByModelId( - @NotNull(message = "模型ID不能为空！") Integer modelId) { - - Wrapper queryWrapper = Wrappers.lambdaQuery( - SysDataPermissionModelDetail.class).eq(SysDataPermissionModelDetail::getModelId, modelId); - List datas = sysDataPermissionModelDetailService.list( - queryWrapper); - List results = datas.stream() - .map(SysDataPermissionModelDetailBo::new).collect(Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("预览SQL") - @PostMapping("/preview") - public InvokeResult preview( - @Valid @RequestBody List models) { - - String sql = sysDataPermissionModelDetailService.toSql(models); - - return InvokeResultBuilder.success(sql); - } - - @ApiOperation("根据业务ID查询") - @ApiImplicitParam(value = "模型ID", name = "modelId", paramType = "query", required = true) - @GetMapping("/query") - public InvokeResult> queryByBizId( - @NotBlank(message = "业务ID不能为空！") String bizId, - @NotNull(message = "业务类型不能为空！") @IsEnum(message = "业务类型格式错误！", enumClass = SysDataPermissionDataBizType.class) Integer bizType, - @NotNull(message = " 权限类型不能为空！") Integer permissionType) { - - SysDataPermissionData data = sysDataPermissionDataService.getByBizId(bizId, bizType, - permissionType); - if (data == null) { - return InvokeResultBuilder.success(Collections.emptyList()); - } - - List voList = JsonUtil.parseList(data.getPermission(), - SysDataPermissionModelDetailVo.class); - if (CollectionUtil.isEmpty(voList)) { - return InvokeResultBuilder.success(Collections.emptyList()); - } - - List results = this.buildChildren(voList); - - return InvokeResultBuilder.success(results); - } - - private List buildChildren( - List children) { - if (CollectionUtil.isEmpty(children)) { - return Collections.emptyList(); - } - - List results = new ArrayList<>(children.size()); - for (SysDataPermissionModelDetailVo vo : children) { - SysDataPermissionModelDetail modelDetail = sysDataPermissionModelDetailService.getById( - vo.getDetailId()); - QuerySysDataPermissionModelDetailBo result = new QuerySysDataPermissionModelDetailBo(); - result.setId(vo.getId()); - result.setDetailId(vo.getDetailId()); - result.setCalcType(vo.getCalcType()); - result.setNodeType(vo.getNodeType()); - result.setValue(vo.getValue()); - result.setValues(vo.getValues()); - result.setConditionType(vo.getConditionType()); - SysDataPermissionModelDetailNodeType nodeType = EnumUtil.getByCode( - SysDataPermissionModelDetailNodeType.class, vo.getNodeType()); - if (nodeType == SysDataPermissionModelDetailNodeType.CALC) { - SysDataPermissionModelDetailCalcType calcType = EnumUtil.getByCode( - SysDataPermissionModelDetailCalcType.class, vo.getCalcType()); - result.setName(calcType.getDesc()); - result.setChildren(this.buildChildren(vo.getChildren())); - } else { - result.setName(modelDetail.getName()); - result.setModelId(modelDetail.getModelId()); - result.setConditionTypes( - Arrays.stream(modelDetail.getConditionType().split(StringPool.STR_SPLIT)) - .map(t -> EnumUtil.getByCode( - SysDataPermissionModelDetailConditionType.class, t).getCode()) - .toArray(Integer[]::new)); - result.setInputType(modelDetail.getInputType().getCode()); - result.setEnumName(modelDetail.getEnumName()); - } - - results.add(result); - } - - return results; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1100e034d7bc263808a77cc335da601a4cd1c4b3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java +++ /dev/null @@ -1,176 +0,0 @@ -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.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 io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import java.util.ArrayList; -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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 部门管理 - * - * @author zmj - */ -@Api(tags = "部门管理") -@Validated -@RestController -@RequestMapping("/system/dept") -public class SysDeptController extends DefaultBaseController { - - @Autowired - private SysDeptService sysDeptService; - - @Autowired - private RecursionMappingService recursionMappingService; - - /** - * 部门树形菜单数据 - */ - @ApiOperation("部门树形菜单数据") - @HasPermission({"system:dept:query", "system:dept:add", "system:dept:modify"}) - @GetMapping("/trees") - public InvokeResult> trees() { - - List datas = sysDeptService.selector(); - if (CollectionUtil.isEmpty(datas)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List results = datas.stream().map(SysDeptTreeBo::new) - .collect(Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - /** - * 查询部门 - */ - @ApiOperation("部门详情") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:dept:query", "system:dept:add", "system:dept:modify"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysDept data = sysDeptService.findById(id); - if (data == null) { - throw new DefaultClientException("部门不存在！"); - } - - GetSysDeptBo result = new GetSysDeptBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 停用部门 - */ - @ApiOperation("停用部门") - @HasPermission({"system:dept:modify"}) - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "部门ID", required = true) @NotEmpty(message = "部门ID不能为空！") String id) { - - sysDeptService.unable(id); - - List batchIds = new ArrayList<>(); - batchIds.add(id); - - List tmp = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - batchIds.addAll(tmp); - sysDeptService.cleanCacheByKeys(batchIds); - - return InvokeResultBuilder.success(); - } - - /** - * 启用部门 - */ - @ApiOperation("启用部门") - @HasPermission({"system:dept:modify"}) - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "部门ID", required = true) @NotEmpty(message = "部门ID不能为空！") String id) { - - sysDeptService.enable(id); - - List batchIds = new ArrayList<>(); - batchIds.add(id); - - List tmp = recursionMappingService.getNodeParentIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - batchIds.addAll(tmp); - sysDeptService.cleanCacheByKeys(batchIds); - - return InvokeResultBuilder.success(); - } - - /** - * 新增部门 - */ - @ApiOperation("新增部门") - @HasPermission({"system:dept:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysDeptVo vo) { - - sysDeptService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改部门 - */ - @ApiOperation("修改部门") - @HasPermission({"system:dept:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysDeptVo vo) { - - sysDeptService.update(vo); - - List batchIds = new ArrayList<>(); - batchIds.add(vo.getId()); - - if (vo.getAvailable()) { - List ids = recursionMappingService.getNodeParentIds(vo.getId(), - ApplicationUtil.getBean(SysDeptNodeType.class)); - batchIds.addAll(ids); - } else { - List ids = recursionMappingService.getNodeChildIds(vo.getId(), - ApplicationUtil.getBean(SysDeptNodeType.class)); - batchIds.addAll(ids); - } - - 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 deleted file mode 100644 index 53f216afafb3eccf952f1c4ddae0b4390404172d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysGenerateCodeController.java +++ /dev/null @@ -1,168 +0,0 @@ -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 deleted file mode 100644 index 82adf81d1d8815af66ab1536569d3f47e6c377fb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMailMessageController.java +++ /dev/null @@ -1,83 +0,0 @@ -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-sys/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 deleted file mode 100644 index d6cad18ac088c6968367e432fa3717c04d864bef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.lframework.xingyun.template.inner.controller.system; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -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.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 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.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; - -/** - * 系统菜单管理 - * - * @author zmj - */ -@Api(tags = "系统菜单管理") -@Validated -@RestController -@RequestMapping("/system/menu") -public class SysMenuController extends DefaultBaseController { - - @Autowired - private SysMenuService sysMenuService; - - @Autowired - private SysModuleTenantService sysModuleTenantService; - - /** - * 系统菜单列表 - */ - @ApiOperation("系统菜单列表") - @HasPermission({"system:menu:query", "system:menu:add"}) - @GetMapping("/query") - public InvokeResult> query() { - - // 先查询当前租户使用的module - List moduleIds = null; - if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( - TenantContextHolder.getTenantId()); - } - - List results = CollectionUtil.emptyList(); - List datas = sysMenuService.queryList(moduleIds); - if (CollectionUtil.isNotEmpty(datas)) { - results = datas.stream().map(QuerySysMenuBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 新增系统菜单 - */ - @ApiOperation("新增系统菜单") - @HasPermission({"system:menu:add"}) - @PostMapping - public InvokeResult add(@Valid CreateSysMenuVo vo) { - - this.validVo(vo); - - sysMenuService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 查看系统菜单 - */ - @ApiOperation("查看系统菜单") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:menu:query", "system:menu:add", "system:menu:modify"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysMenu data = sysMenuService.findById(id); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("菜单不存在！"); - } - - return InvokeResultBuilder.success(new GetSysMenuBo(data)); - } - - /** - * 修改系统菜单 - */ - @ApiOperation("修改系统菜单") - @HasPermission({"system:menu:modify"}) - @PutMapping - public InvokeResult modify(@Valid UpdateSysMenuVo vo) { - - this.validVo(vo); - - sysMenuService.update(vo); - - sysMenuService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 根据ID删除 - */ - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:menu:delete"}) - @DeleteMapping - public InvokeResult delete(@NotBlank(message = "ID不能为空！") String id) { - - sysMenuService.deleteById(id); - - sysMenuService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - /** - * 启用 - */ - @ApiOperation("启用") - @HasPermission({"system:menu:modify"}) - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "菜单ID", required = true) @NotEmpty(message = "菜单ID不能为空！") String id) { - - sysMenuService.enable(id); - - sysMenuService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - /** - * 停用 - */ - @ApiOperation("停用") - @HasPermission({"system:menu:modify"}) - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "菜单ID", required = true) @NotEmpty(message = "菜单ID不能为空！") String id) { - - sysMenuService.unable(id); - - sysMenuService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - private void validVo(CreateSysMenuVo vo) { - - SysMenuDisplay sysMenuDisplay = EnumUtil.getByCode(SysMenuDisplay.class, vo.getDisplay()); - - if (sysMenuDisplay == SysMenuDisplay.CATALOG || sysMenuDisplay == SysMenuDisplay.FUNCTION) { - if (StringUtil.isBlank(vo.getName())) { - throw new InputErrorException("请输入路由名称！"); - } - - if (StringUtil.isBlank(vo.getPath())) { - throw new InputErrorException("请输入路由路径！"); - } - - if (ObjectUtil.isNull(vo.getHidden())) { - throw new InputErrorException("请选择是否隐藏！"); - } - - if (sysMenuDisplay == SysMenuDisplay.FUNCTION) { - if (vo.getComponentType() == null) { - throw new InputErrorException("请选择组件类型！"); - } - if (StringUtil.isBlank(vo.getComponent())) { - throw new InputErrorException("请输入组件！"); - } - if (ObjectUtil.isNull(vo.getNoCache())) { - throw new InputErrorException("请选择是否不缓存！"); - } - - if (!StringUtil.isBlank(vo.getParentId())) { - SysMenu parentMenu = sysMenuService.findById(vo.getParentId()); - - if (parentMenu.getDisplay() != SysMenuDisplay.CATALOG) { - throw new InputErrorException( - "当菜单类型是“" + SysMenuDisplay.FUNCTION.getDesc() + "”时，父级菜单类型必须是“" - + SysMenuDisplay.CATALOG.getDesc() + "”！"); - } - } - } - } else if (sysMenuDisplay == SysMenuDisplay.PERMISSION) { - if (StringUtil.isBlank(vo.getParentId())) { - throw new InputErrorException( - "当菜单类型是“" + SysMenuDisplay.PERMISSION.getDesc() + "”时，父级菜单不能为空！"); - } - - SysMenu parentMenu = sysMenuService.findById(vo.getParentId()); - if (ObjectUtil.isNull(parentMenu)) { - throw new InputErrorException( - "当菜单类型是“" + SysMenuDisplay.PERMISSION.getDesc() + "”时，父级菜单不能为空！"); - } - - if (parentMenu.getDisplay() != SysMenuDisplay.FUNCTION) { - throw new InputErrorException( - "当菜单类型是“" + SysMenuDisplay.PERMISSION.getDesc() + "”时，父级菜单类型必须是“" - + SysMenuDisplay.FUNCTION.getDesc() + "”！"); - } - if (StringUtil.isBlank(vo.getPermission())) { - throw new InputErrorException("请输入权限！"); - } - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9ebd5a54cf9427f5b63b2a237814c058f3a4776a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysModuleController.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.lframework.xingyun.template.inner.controller.system; - -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.ObjectUtil; -import com.lframework.xingyun.template.inner.bo.system.module.QuerySysModuleBo; -import com.lframework.xingyun.template.inner.entity.SysModule; -import com.lframework.xingyun.template.inner.entity.SysModuleTenant; -import com.lframework.xingyun.template.inner.service.SysModuleService; -import com.lframework.xingyun.template.inner.service.SysModuleTenantService; -import com.lframework.xingyun.template.inner.vo.system.module.SysModuleTenantVo; -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.TenantUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import java.util.Collections; -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.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 系统模块管理 - * - * @author zmj - */ -@Api(tags = "系统模块管理") -@Validated -@RestController -@RequestMapping("/system/module") -public class SysModuleController extends DefaultBaseController { - - @Autowired - private SysModuleService sysModuleService; - - @Autowired - private SysModuleTenantService sysModuleTenantService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission(value = {"system:tenant:module"}) - @GetMapping("/query") - public InvokeResult> query(@NotNull(message = "租户ID不能为空！") Integer tenantId) { - - if (!TenantUtil.enableTenant()) { - return InvokeResultBuilder.success(Collections.emptyList()); - } - - // 先查询所有模块 - List sysModules = sysModuleService.list(); - List results = sysModules.stream().map(QuerySysModuleBo::new) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(results)) { - return InvokeResultBuilder.success(results); - } - - List sysModuleTenants = sysModuleTenantService.getByTenantId(tenantId); - - for (QuerySysModuleBo result : results) { - SysModuleTenant sysModuleTenant = sysModuleTenants.stream() - .filter(t -> ObjectUtil.equal(t.getModuleId(), result.getId())).findFirst().orElse(null); - result.setEnabled(sysModuleTenant != null); - if (sysModuleTenant == null) { - continue; - } - result.setExpireTime(sysModuleTenant.getExpireTime()); - } - - return InvokeResultBuilder.success(results); - } - - /** - * 模块授权 - */ - @ApiOperation("模块授权") - @HasPermission(value = {"system:tenant:module"}) - @PostMapping("/setting") - public InvokeResult setting( - @RequestBody(required = false) @Valid SysModuleTenantVo vo) { - - if (!TenantUtil.enableTenant()) { - return InvokeResultBuilder.success(); - } - sysModuleTenantService.setting(vo); - - sysModuleTenantService.cleanCacheByKey(vo.getTenantId()); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 274676ebda113be23a937aa41ef7a956f17b15a7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java +++ /dev/null @@ -1,174 +0,0 @@ -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.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.annotations.security.HasPermission; -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; -import com.lframework.xingyun.template.inner.bo.system.notice.GetSysNoticeBo; -import com.lframework.xingyun.template.inner.bo.system.notice.QueryMySysNoticeBo; -import com.lframework.xingyun.template.inner.bo.system.notice.QuerySysNoticeBo; -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; -import com.lframework.xingyun.template.inner.vo.system.notice.CreateSysNoticeVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeByUserVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeVo; -import com.lframework.xingyun.template.inner.vo.system.notice.UpdateSysNoticeVo; -import com.lframework.xingyun.template.inner.service.system.SysNoticeService; -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.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/notice") -public class SysNoticeController extends DefaultBaseController { - - @Autowired - private SysNoticeService sysNoticeService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:notice:publish"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysNoticeVo vo) { - - PageResult pageResult = sysNoticeService.query(getPageIndex(vo), getPageSize(vo), - vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysNoticeBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 查询我的通知 - */ - @ApiOperation("查询我的通知") - @GetMapping("/query/my") - public InvokeResult> queryMyNotice( - @Valid QuerySysNoticeByUserVo vo) { - - vo.setUserId(SecurityUtil.getCurrentUser().getId()); - - PageResult pageResult = sysNoticeService.queryByUser(getPageIndex(vo), - getPageSize(vo), vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryMySysNoticeBo::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) { - - SysNoticeDto data = sysNoticeService.getContent(id); - if (data == null) { - throw new DefaultClientException("系统通知不存在！"); - } - - String currentUserId = SecurityUtil.getCurrentUser().getId(); - ThreadUtil.execAsync(new DefaultRunnable(() -> { - sysNoticeService.setReaded(id, currentUserId); - - sysNoticeService.noticeForWs(currentUserId); - })); - - return InvokeResultBuilder.success(data); - } - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "id不能为空！") String id) { - - SysNotice data = sysNoticeService.findById(id); - if (data == null) { - throw new DefaultClientException("系统通知不存在！"); - } - - GetSysNoticeBo result = new GetSysNoticeBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增 - */ - @ApiOperation("新增") - @HasPermission({"system:notice:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysNoticeVo vo) { - - sysNoticeService.create(vo); - - if (vo.getPublished()) { - sysNoticeService.noticeForWs(); - } - - return InvokeResultBuilder.success(); - } - - /** - * 修改 - */ - @ApiOperation("修改") - @HasPermission({"system:notice:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysNoticeVo vo) { - - sysNoticeService.update(vo); - - sysNoticeService.cleanCacheByKey(vo.getId()); - - if (vo.getPublished()) { - sysNoticeService.noticeForWs(); - } - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNotifyGroupController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNotifyGroupController.java deleted file mode 100644 index 474c07c690298d486355a8925735b6833e5e6e42..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNotifyGroupController.java +++ /dev/null @@ -1,118 +0,0 @@ -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.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 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.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; - -/** - * 消息通知组 Controller - * - * @author zmj - */ -@Api(tags = "消息通知组") -@Validated -@RestController -@RequestMapping("/sys/notify/group") -public class SysNotifyGroupController extends DefaultBaseController { - - @Autowired - private SysNotifyGroupService sysNotifyGroupService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:notify-group:query"}) - @GetMapping("/query") - public InvokeResult> query( - @Valid QuerySysNotifyGroupVo vo) { - - PageResult pageResult = sysNotifyGroupService.query( - getPageIndex(vo), - getPageSize(vo), vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysNotifyGroupBo::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:notify-group:query"}) - @GetMapping("/detail") - public InvokeResult getDetail( - @NotBlank(message = "id不能为空！") String id) { - - SysNotifyGroup data = sysNotifyGroupService.findById(id); - if (data == null) { - throw new DefaultClientException("消息通知组不存在！"); - } - - GetSysNotifyGroupBo result = new GetSysNotifyGroupBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增 - */ - @ApiOperation("新增") - @HasPermission({"system:notify-group:add"}) - @PostMapping - public InvokeResult create(@Valid @RequestBody CreateSysNotifyGroupVo vo) { - - sysNotifyGroupService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改 - */ - @ApiOperation("修改") - @HasPermission({"system:notify-group:modify"}) - @PutMapping - public InvokeResult update(@Valid @RequestBody UpdateSysNotifyGroupVo vo) { - - sysNotifyGroupService.update(vo); - - sysNotifyGroupService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ebda9e405eac65b2d03261f302dc05461b347357..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysOpenDomainController.java +++ /dev/null @@ -1,129 +0,0 @@ -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.bo.system.open.GetSysOpenDomainBo; -import com.lframework.xingyun.template.inner.bo.system.open.QuerySysOpenDomainBo; -import com.lframework.xingyun.template.inner.entity.SysOpenDomain; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysOpenDomainService; -import com.lframework.xingyun.template.inner.vo.system.open.QuerySysOpenDomainVo; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.inner.vo.system.open.CreateSysOpenDomainVo; -import com.lframework.xingyun.template.inner.vo.system.open.UpdateSysOpenDomainSecretVo; -import com.lframework.xingyun.template.inner.vo.system.open.UpdateSysOpenDomainVo; -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 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.GetMapping; -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; - -/** - * 开放域 - * - * @author zmj - */ -@Api(tags = "开放域") -@Validated -@RestController -@RequestMapping("/system/open/domain") -public class SysOpenDomainController extends DefaultBaseController { - - @Autowired - private SysOpenDomainService sysOpenDomainService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:open-domain:config"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysOpenDomainVo vo) { - - PageResult pageResult = sysOpenDomainService.query(vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysOpenDomainBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 详情 - */ - @ApiOperation("详情") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:open-domain:config"}) - @GetMapping - public InvokeResult get(@NotNull(message = "ID不能为空！") Integer id) { - - SysOpenDomain data = sysOpenDomainService.findById(id); - if (data == null) { - throw new DefaultClientException("开放域不存在！"); - } - - GetSysOpenDomainBo result = new GetSysOpenDomainBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增 - */ - @ApiOperation("新增") - @HasPermission({"system:open-domain:config"}) - @PostMapping - public InvokeResult create(@Valid CreateSysOpenDomainVo vo) { - - sysOpenDomainService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改 - */ - @ApiOperation("修改") - @HasPermission({"system:open-domain:config"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysOpenDomainVo vo) { - - sysOpenDomainService.update(vo); - - sysOpenDomainService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 修改Api密钥 - */ - @ApiOperation("修改Api密钥") - @HasPermission({"system:open-domain:config"}) - @PutMapping("/secret") - public InvokeResult updateSecret(@Valid UpdateSysOpenDomainSecretVo vo) { - - sysOpenDomainService.updateApiSecret(vo); - - sysOpenDomainService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index cb03f96fdfaefba6d74923edcf579fd467d56d17..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysParameterController.java +++ /dev/null @@ -1,138 +0,0 @@ -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.SysParameter; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysParameterService; -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.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.inner.bo.system.parameter.GetSysParameterBo; -import com.lframework.xingyun.template.inner.bo.system.parameter.QuerySysParameterBo; -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 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 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.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/parameter") -public class SysParameterController extends DefaultBaseController { - - @Autowired - private SysParameterService sysParameterService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"system:parameter:query"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysParameterVo vo) { - - PageResult pageResult = sysParameterService.query(getPageIndex(vo), - getPageSize(vo), vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysParameterBo::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:parameter:query"}) - @GetMapping - public InvokeResult get(@NotNull(message = "id不能为空！") Long id) { - - SysParameter data = sysParameterService.getById(id); - if (data == null) { - throw new DefaultClientException("系统参数不存在！"); - } - - GetSysParameterBo result = new GetSysParameterBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增 - */ - @ApiOperation("新增") - @HasPermission({"system:parameter:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysParameterVo vo) { - - sysParameterService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改 - */ - @ApiOperation("修改") - @HasPermission({"system:parameter:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysParameterVo vo) { - - sysParameterService.update(vo); - - sysParameterService.cleanCacheByKey(vo.getId()); - - SysParameter data = sysParameterService.findById(vo.getId()); - sysParameterService.cleanCacheByKey(data.getPmKey()); - - return InvokeResultBuilder.success(); - } - - /** - * 根据ID删除 - */ - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) - @HasPermission({"system:parameter:delete"}) - @DeleteMapping - public InvokeResult deleteById(@NotNull(message = "id不能为空！") Long id) { - - SysParameter data = sysParameterService.findById(id); - - sysParameterService.deleteById(id); - - sysParameterService.cleanCacheByKey(id); - - sysParameterService.cleanCacheByKey(data.getPmKey()); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c21c971b6eefd35a61365fc6c01c4150ae05117d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java +++ /dev/null @@ -1,149 +0,0 @@ -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.bo.system.role.GetSysRoleBo; -import com.lframework.xingyun.template.inner.bo.system.role.QuerySysRoleBo; -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysRoleService; -import com.lframework.starter.web.utils.PageResultUtil; -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.UpdateSysRoleVo; -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 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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 角色管理 - * - * @author zmj - */ -@Api(tags = "角色管理") -@Validated -@RestController -@RequestMapping("/system/role") -public class SysRoleController extends DefaultBaseController { - - @Autowired - private SysRoleService sysRoleService; - - /** - * 角色列表 - */ - @ApiOperation("角色列表") - @HasPermission({"system:role:query","system:role:add","system:role:modify"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysRoleVo vo) { - - PageResult pageResult = sysRoleService.query(getPageIndex(vo), - getPageSize(vo), vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysRoleBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 查询角色 - */ - @ApiOperation("查询角色") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:role:query","system:role:add","system:role:modify"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysRole data = sysRoleService.findById(id); - if (data == null) { - throw new DefaultClientException("角色不存在！"); - } - - GetSysRoleBo result = new GetSysRoleBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 停用角色 - */ - @ApiOperation("停用角色") - @HasPermission({"system:role:modify"}) - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "角色ID", required = true) @NotEmpty(message = "角色ID不能为空！") String id) { - - sysRoleService.unable(id); - - sysRoleService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - /** - * 启用角色 - */ - @ApiOperation("启用角色") - @HasPermission({"system:role:modify"}) - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "角色ID", required = true) @NotEmpty(message = "角色ID不能为空！") String id) { - - sysRoleService.enable(id); - - sysRoleService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - /** - * 新增角色 - */ - @ApiOperation("新增角色") - @HasPermission({"system:role:add"}) - @PostMapping - public InvokeResult create(@Valid CreateSysRoleVo vo) { - - sysRoleService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改角色 - */ - @ApiOperation("修改角色") - @HasPermission({"system:role:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateSysRoleVo vo) { - - sysRoleService.update(vo); - - sysRoleService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e3a41123f2b107a7cfab8a7ba1a9c3e7ba6e2307..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java +++ /dev/null @@ -1,98 +0,0 @@ -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.xingyun.template.inner.bo.system.role.QueryRoleMenuBo; -import com.lframework.xingyun.template.inner.entity.SysMenu; -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.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.TenantUtil; -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 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.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 角色授权 - * - * @author zmj - */ -@Api(tags = "角色授权") -@Validated -@RestController -@RequestMapping("/system/role/menu") -public class SysRoleMenuController extends DefaultBaseController { - - @Autowired - private SysMenuService sysMenuService; - - @Autowired - private SysRoleMenuService sysRoleMenuService; - - @Autowired - private SysModuleTenantService sysModuleTenantService; - - /** - * 查询角色菜单列表 - */ - @ApiOperation("查询角色菜单列表") - @ApiImplicitParam(value = "角色ID", name = "roleId", paramType = "query") - @HasPermission({"system:role:permission"}) - @GetMapping("/menus") - public InvokeResult> menus(String roleId) { - - // 先查询当前租户使用的module - List moduleIds = null; - if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId(TenantContextHolder.getTenantId()); - } - - List results = CollectionUtil.emptyList(); - //查询所有菜单 - List allMenu = sysMenuService.queryList(moduleIds); - if (!CollectionUtil.isEmpty(allMenu)) { - results = allMenu.stream().map(QueryRoleMenuBo::new).collect(Collectors.toList()); - - if (!StringUtil.isBlank(roleId)) { - List menus = sysMenuService.getByRoleId(roleId, moduleIds); - if (!CollectionUtil.isEmpty(menus)) { - //当角色的菜单存在时，设置已选择属性 - for (QueryRoleMenuBo result : results) { - result.setSelected( - menus.stream().anyMatch(t -> StringUtil.equals(t.getId(), result.getId()))); - } - } - } - } - - return InvokeResultBuilder.success(results); - } - - /** - * 授权角色菜单 - */ - @ApiOperation("授权角色菜单") - @HasPermission({"system:role:permission"}) - @PostMapping("/setting") - public InvokeResult setting(@Valid @RequestBody SysRoleMenuSettingVo vo) { - - sysRoleMenuService.setting(vo); - return InvokeResultBuilder.success(); - } -} 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 deleted file mode 100644 index 346d970ccd199bbf3ae7daea0d2f77c9ad8907da..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysSiteMessageController.java +++ /dev/null @@ -1,135 +0,0 @@ -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-sys/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 deleted file mode 100644 index 5c0a3a5836e9b4027335d1cea288c96b99e878a3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java +++ /dev/null @@ -1,166 +0,0 @@ -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.user.GetSysUserBo; -import com.lframework.xingyun.template.inner.bo.system.user.QuerySysUserBo; -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; -import com.lframework.xingyun.template.inner.vo.system.user.UpdateSysUserVo; -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; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户管理 - * - * @author zmj - */ -@Api(tags = "用户管理") -@Validated -@RestController -@RequestMapping("/system/user") -public class SysUserController extends DefaultBaseController { - - @Autowired - private SysUserService sysUserService; - - /** - * 用户列表 - */ - @ApiOperation("用户列表") - @HasPermission({"system:user:query", "system:user:add", "system:user:modify"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysUserVo vo) { - - PageResult pageResult = sysUserService.query(getPageIndex(vo), - getPageSize(vo), vo); - - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysUserBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 查询用户 - */ - @ApiOperation("查询用户") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:user:query", "system:user:add", "system:user:modify"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { - - SysUser data = sysUserService.findById(id); - if (data == null) { - throw new DefaultClientException("用户不存在！"); - } - - GetSysUserBo result = new GetSysUserBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 停用用户 - */ - @ApiOperation("停用用户") - @HasPermission({"system:user:modify"}) - @PatchMapping("/unable") - public InvokeResult unable( - @ApiParam(value = "用户ID", required = true) @NotEmpty(message = "用户ID不能为空！") String id) { - - sysUserService.unable(id); - - sysUserService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - /** - * 启用用户 - */ - @ApiOperation("启用用户") - @HasPermission({"system:user:modify"}) - @PatchMapping("/enable") - public InvokeResult enable( - @ApiParam(value = "用户ID", required = true) @NotEmpty(message = "用户ID不能为空！") String id) { - - sysUserService.enable(id); - - sysUserService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } - - /** - * 新增用户 - */ - @ApiOperation("新增用户") - @HasPermission({"system:user:add"}) - @PostMapping - public InvokeResult create(@Valid @RequestBody CreateSysUserVo vo) { - - sysUserService.create(vo); - - return InvokeResultBuilder.success(); - } - - /** - * 修改用户 - */ - @ApiOperation("修改用户") - @HasPermission({"system:user:modify"}) - @PutMapping - public InvokeResult update(@Valid @RequestBody UpdateSysUserVo vo) { - - sysUserService.update(vo); - - sysUserService.cleanCacheByKey(vo.getId()); - - return InvokeResultBuilder.success(); - } - - /** - * 解锁用户 - */ - @ApiOperation("解锁用户") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:user:modify"}) - @PatchMapping("/unlock") - public InvokeResult unlock(@NotBlank(message = "ID不能为空！") String id) { - - sysUserService.unlockById(id); - - sysUserService.cleanCacheByKey(id); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 329696dd5e4c04de6b617efb80501a31f410eb92..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserRoleController.java +++ /dev/null @@ -1,91 +0,0 @@ -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.xingyun.template.inner.bo.system.user.QueryUserRoleBo; -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.xingyun.template.inner.service.system.SysRoleService; -import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; -import com.lframework.xingyun.template.inner.vo.system.role.QuerySysRoleVo; -import com.lframework.xingyun.template.inner.vo.system.user.SysUserRoleSettingVo; -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 io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Valid; -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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户授权 - * - * @author zmj - */ -@Api(tags = "用户授权") -@Validated -@RestController -@RequestMapping("/system/user/role") -public class SysUserRoleController extends DefaultBaseController { - - @Autowired - private SysRoleService sysRoleService; - - @Autowired - private SysUserRoleService sysUserRoleService; - - /** - * 查询角色列表 - */ - @ApiOperation("查询角色列表") - @ApiImplicitParams({@ApiImplicitParam(value = "用户ID", name = "userId", paramType = "query")}) - @HasPermission({"system:user:permission"}) - @GetMapping("/roles") - public InvokeResult> roles(String userId) { - - List results = CollectionUtil.emptyList(); - //查询所有角色 - QuerySysRoleVo sysRoleVo = new QuerySysRoleVo(); - sysRoleVo.setAvailable(Boolean.TRUE); - List allRole = sysRoleService.query(sysRoleVo); - if (!CollectionUtil.isEmpty(allRole)) { - results = allRole.stream().map(QueryUserRoleBo::new).collect(Collectors.toList()); - - if (!StringUtil.isBlank(userId)) { - List menus = sysRoleService.getByUserId(userId); - if (!CollectionUtil.isEmpty(menus)) { - //当用户角色存在时，设置已选择属性 - for (QueryUserRoleBo result : results) { - result.setSelected( - menus.stream().anyMatch(t -> StringUtil.equals(t.getId(), result.getId()))); - } - } - } - } - - return InvokeResultBuilder.success(results); - } - - /** - * 用户授权 - */ - @ApiOperation("用户授权") - @HasPermission({"system:user:permission"}) - @PostMapping("/setting") - public InvokeResult setting(@Valid @RequestBody SysUserRoleSettingVo vo) { - - sysUserRoleService.setting(vo); - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 82d0a46d26d2424046ca0133f29dc7d094bf1009..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.lframework.xingyun.template.inner.controller.system; - -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.utils.EncryptUtil; -import com.lframework.xingyun.template.inner.bo.system.tenant.GetTenantBo; -import com.lframework.xingyun.template.inner.bo.system.tenant.QueryTenantBo; -import com.lframework.xingyun.template.inner.entity.Tenant; -import com.lframework.starter.web.resp.PageResult; -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.UpdateTenantVo; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.annotations.security.HasPermission; -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; -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 lombok.extern.slf4j.Slf4j; -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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 租户管理 - * - * @author zmj - */ -@Slf4j -@Api(tags = "租户管理") -@Validated -@RestController -@RequestMapping("/system/tenant") -public class TenantController extends DefaultBaseController { - - @Autowired - private TenantService tenantService; - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission(value = {"system:tenant:query", "system:tenant:add", - "system:tenant:modify"}) - @GetMapping("/query") - public InvokeResult> query(@Valid QueryTenantVo vo) { - - PageResult pageResult = tenantService.query(getPageIndex(vo), - getPageSize(vo), vo); - - List datas = pageResult.getDatas(); - List results = datas.stream().map(QueryTenantBo::new) - .collect(Collectors.toList()); - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 查询详情 - */ - @ApiOperation("查询详情") - @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission(value = {"system:tenant:query", "system:tenant:add", - "system:tenant:modify"}) - @GetMapping - public InvokeResult get(@NotNull(message = "ID不能为空！") Integer id) { - - Tenant data = tenantService.findById(id); - if (data == null) { - throw new DefaultClientException("租户不存在！"); - } - - GetTenantBo result = new GetTenantBo(data); - - return InvokeResultBuilder.success(result); - } - - /** - * 新增租户 - */ - @ApiOperation("新增租户") - @HasPermission(value = {"system:tenant:add"}) - @PostMapping - public InvokeResult create(@Valid CreateTenantVo vo) { - - Integer tenantId = tenantService.create(vo); - - try { - ReloadTenantEvent event = new ReloadTenantEvent(this, tenantId, vo.getJdbcUrl(), - vo.getJdbcUsername(), vo.getJdbcPassword()); - ApplicationUtil.publishEvent(event); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultClientException( - "动态加载租户数据源失败，请检查配置项！注意：虽然加载数据源失败，但是租户已经新增，请勿重复新增！"); - } - - return InvokeResultBuilder.success(); - } - - /** - * 修改租户 - */ - @ApiOperation("修改租户") - @HasPermission(value = {"system:tenant:modify"}) - @PutMapping - public InvokeResult update(@Valid UpdateTenantVo vo) { - - tenantService.update(vo); - - tenantService.cleanCacheByKey(vo.getId()); - - if (StringUtil.isNotBlank(vo.getJdbcUrl()) || StringUtil.isNotBlank(vo.getJdbcUsername()) - || StringUtil.isNotBlank(vo.getJdbcPassword())) { - // 这里不走缓存 - Tenant tenant = tenantService.getById(vo.getId()); - try { - ReloadTenantEvent event = new ReloadTenantEvent(this, tenant.getId(), tenant.getJdbcUrl(), - tenant.getJdbcUsername(), EncryptUtil.decrypt(tenant.getJdbcPassword())); - ApplicationUtil.publishEvent(event); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new DefaultClientException( - "动态加载租户数据源失败，请检查配置项！"); - } - } - - return InvokeResultBuilder.success(); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 09a1a2885d82526ca65ef6951c3069053871feba..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lframework.xingyun.template.inner.dto; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import java.util.Set; -import lombok.Data; - -/** - * 用户登录Dto - * - * @author zmj - */ -@Data -public class LoginDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * Token - */ - private String token; - - /** - * 用户信息 - */ - private UserInfoDto user; - - /** - * 角色 - */ - private Set roles; - - public LoginDto(String token, String name, Set roles) { - - this.token = token; - this.setRoles(roles); - - UserInfoDto userInfo = new UserInfoDto(); - userInfo.setName(name); - this.setUser(userInfo); - } - - @Data - public static class UserInfoDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 姓名 - */ - private String name; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a21b06ff438921eec949ef0fffb904f7453cb82f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/MenuDto.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.lframework.xingyun.template.inner.dto; - -import com.lframework.starter.web.dto.BaseDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -/** - * 菜单Dto - * - * @author zmj - */ -@Data -public class MenuDto implements BaseDto, Serializable { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 菜单名称 - */ - @ApiModelProperty("菜单名称") - private String name; - - /** - * 路径 - */ - @ApiModelProperty("路径") - private String path; - - /** - * 是否隐藏 - */ - @ApiModelProperty("是否隐藏") - private Boolean hidden; - - /** - * 类型 0-目录 1-功能菜单 2-权限 - */ - @ApiModelProperty("类型 0-目录 1-功能菜单 2-权限") - private Integer display; - - /** - * 组件类型 - */ - @ApiModelProperty("组件类型") - private Integer componentType; - - /** - * 组件 - */ - @ApiModelProperty("组件") - private String component; - - /** - * 自定义请求参数 - */ - @ApiModelProperty("自定义请求参数") - private String requestParam; - - - /** - * meta - */ - @ApiModelProperty("meta") - private MenuMetaDto meta; - - /** - * 父节点ID - */ - @ApiModelProperty("父节点ID") - private String parentId; - - /** - * 是否收藏 - */ - @ApiModelProperty("是否收藏") - private Boolean isCollect = Boolean.FALSE; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 94cf8d81ecb1fafc31a77916c60ac120e7b70a00..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/MenuMetaDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.dto; - -import com.lframework.starter.web.dto.BaseDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -/** - * 菜单Meta Dto - * - * @author zmj - */ -@Data -public class MenuMetaDto implements BaseDto, Serializable { - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 是否不缓存 - */ - @ApiModelProperty("是否不缓存") - private Boolean noCache; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 1e0533e806d2200de990c88db1afad343ef7e5ea..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/UserInfoDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lframework.xingyun.template.inner.dto; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import lombok.Data; - -/** - * 用户信息 Dto - * - * @author zmj - */ -@Data -public class UserInfoDto implements BaseDto, Serializable { - - public static final String CACHE_NAME = "UserInfoDto"; - - /** - * ID - */ - private String id; - - /** - * 登录名 - */ - private String username; - - /** - * 编号 - */ - private String code; - - /** - * 姓名 - */ - private String name; - - /** - * 邮箱 - */ - private String email; - - /** - * 联系电话 - */ - private String telephone; - - /** - * 性别 - */ - private Integer gender; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 15d14e000877d024cfa88b18ac4194d9cee8d299..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/SysNoticeTaskDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lframework.xingyun.template.inner.dto.message; - -import com.lframework.starter.common.utils.DateUtil; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.BaseDto; -import com.lframework.xingyun.template.inner.dto.system.notice.QuerySysNoticeByUserDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SysNoticeTaskDto extends BaseBo implements BaseDto, - Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 是否已读 - */ - @ApiModelProperty("是否已读") - private Boolean readed; - - /** - * 发布时间 - */ - @ApiModelProperty("发布时间") - private String publishTime; - - public SysNoticeTaskDto(QuerySysNoticeByUserDto dto) { - super(dto); - } - - @Override - protected void afterInit(QuerySysNoticeByUserDto dto) { - this.publishTime = DateUtil.formatDateTime(dto.getPublishTime()); - } -} 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 deleted file mode 100644 index 65e3b015bf0f2721b7075c9768ccbbebec0ad728..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/site/SiteMessageDto.java +++ /dev/null @@ -1,34 +0,0 @@ -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-sys/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 deleted file mode 100644 index bf028893bc703671a2b0171c2f0fed7d46aa9aa5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/qrtz/QrtzDto.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.lframework.xingyun.template.inner.dto.qrtz; - -import com.lframework.xingyun.template.inner.enums.QrtzJobType; -import com.lframework.xingyun.template.inner.enums.TriggerState; -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import java.util.List; -import lombok.Data; - -/** - * @author zmj - * @since 2022/8/20 - */ -@Data -public class QrtzDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - private String name; - - /** - * 分组 - */ - private String group; - - /** - * 租户ID - */ - private Integer tenantId; - - /** - * 备注 - */ - private String description; - - /** - * 执行类名 - */ - private String targetClassName; - - /** - * 执行方法名 - */ - private String targetMethodName; - - /** - * 执行参数类型 - */ - private List targetParamTypes; - - /** - * 执行参数 - */ - private List targetParams; - - /** - * 脚本 - */ - private String script; - - /** - * 任务类型 - */ - private QrtzJobType jobType; - - /** - * Cron表达式 - */ - private String cron; - - /** - * 状态 - */ - private TriggerState state; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index debd7c9d044bb3e00f95214805e8687de0d451b4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/QuerySysNoticeByUserDto.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.inner.dto.system.notice; - -import com.lframework.starter.web.dto.BaseDto; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; - -/** - * @author zmj - * @since 2022/8/19 - */ -@Data -public class QuerySysNoticeByUserDto implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 是否已读 - */ - private Boolean readed; - - /** - * 发布时间 - */ - private LocalDateTime publishTime; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4697977daca0acd8df47cf9a1d42a72923a1460b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/SysNoticeDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.inner.dto.system.notice; - -import com.lframework.xingyun.template.inner.entity.SysNotice; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.dto.BaseDto; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -/** - * @author zmj - * @since 2022/8/18 - */ -@Data -public class SysNoticeDto extends BaseBo implements BaseDto, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 标题 - */ - @ApiModelProperty("标题") - private String title; - - /** - * 内容 - */ - @ApiModelProperty("内容") - private String content; - - public SysNoticeDto(SysNotice dto) { - super(dto); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fa5cd1cc1d49eb49012b5a3179bb4cd6d62b0f0f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDic.java +++ /dev/null @@ -1,81 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据字典 - *

- * - * @author zmj - */ -@Data -@TableName("sys_data_dic") -public class SysDataDic extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysDataDic"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 分类ID - */ - private String categoryId; - - /** - * 创建人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-sys/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 deleted file mode 100644 index bd47a83b91943f253a1fc291fe562ebfcadee3ab..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicCategory.java +++ /dev/null @@ -1,76 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据字典分类 - *

- * - * @author zmj - */ -@Data -@TableName("sys_data_dic_category") -public class SysDataDicCategory extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysDataDicCategory"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 8d9f2cb549d9f79d6cbebe38b3a18bc22dd4f05a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicItem.java +++ /dev/null @@ -1,86 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 数据字典值 - *

- * - * @author zmj - */ -@Data -@TableName("sys_data_dic_item") -public class SysDataDicItem extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysDataDicItem"; - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 字典ID - */ - private String dicId; - - /** - * 排序编号 - */ - private Integer orderNo; - - /** - * 创建人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-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionData.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionData.java deleted file mode 100644 index e6c21623078ba7c30b3f9b810b6c329f4b9ae150..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionData.java +++ /dev/null @@ -1,44 +0,0 @@ -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.inner.enums.system.SysDataPermissionDataBizType; -import lombok.Data; - -/** - *

- * 数据权限数据 - *

- * - * @author zmj - */ -@Data -@TableName("sys_data_permission_data") -public class SysDataPermissionData extends BaseEntity implements BaseDto { - - /** - * ID - */ - private String id; - - /** - * 业务ID - */ - private String bizId; - - /** - * 业务类型 - */ - private SysDataPermissionDataBizType bizType; - - /** - * 权限类型 - */ - private Integer permissionType; - - /** - * 权限 - */ - private String permission; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionModelDetail.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionModelDetail.java deleted file mode 100644 index 7d2213a94788f6c16e3d405b0a964f4a6a8ac6be..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionModelDetail.java +++ /dev/null @@ -1,67 +0,0 @@ -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.inner.enums.system.SysDataPermissionModelDetailInputType; -import lombok.Data; - -/** - *

- * 数据权限模型明细 - *

- * - * @author zmj - */ -@Data -@TableName("sys_data_permission_model_detail") -public class SysDataPermissionModelDetail extends BaseEntity implements BaseDto { - - /** - * ID - */ - @TableId(type = IdType.AUTO) - private Integer id; - - /** - * 名称 - */ - private String name; - - /** - * 模型ID - */ - private Integer modelId; - - /** - * 条件 - */ - private String conditionType; - - /** - * 输入类型 - */ - private SysDataPermissionModelDetailInputType inputType; - - /** - * 表名 - */ - private String tableName; - - /** - * 字段名 - */ - private String columnName; - - /** - * 前段枚举名 - */ - private String enumName; - - /** - * SQL - */ - private String sqlValue; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f1f4fddef7bd4fa307bafa72ef6af026ab502472..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDept.java +++ /dev/null @@ -1,100 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 部门 - *

- * - * @author zmj - * @since 2021-06-26 - */ -@Data -@TableName("sys_dept") -public class SysDept extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysDept"; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 简称 - */ - private String shortName; - - /** - * 父级ID - */ - @TableField - private String parentId; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-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 deleted file mode 100644 index 5a27ceccf22dcf9174b40cd2b032423127003641..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysGenerateCode.java +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 2db0fda933415363bdcb4be18000757fd1bbfabb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMailMessage.java +++ /dev/null @@ -1,92 +0,0 @@ -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-sys/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 deleted file mode 100644 index 5b6419fd5886a64e24f7adbbb0c54e5143b9b56a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMenu.java +++ /dev/null @@ -1,149 +0,0 @@ -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.xingyun.template.inner.enums.system.SysMenuComponentType; -import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; -import com.lframework.starter.web.dto.BaseDto; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 系统菜单 - *

- * - * @author zmj - * @since 2021-05-10 - */ -@Data -@TableName("sys_menu") -public class SysMenu extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysMenu"; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称（前端使用） - */ - private String name; - - /** - * 标题 - */ - private String title; - - /** - * 图标 - */ - private String icon; - - /** - * 组件类型 - */ - private SysMenuComponentType componentType; - - /** - * 组件（前端使用） - */ - private String component; - - /** - * 自定义请求参数 - */ - private String requestParam; - - /** - * 父级ID - */ - private String parentId; - - /** - * 路由路径（前端使用） - */ - private String path; - - /** - * 是否缓存（前端使用） - */ - private Boolean noCache; - - /** - * 类型 0-目录 1-菜单 2-功能 - */ - private SysMenuDisplay display; - - /** - * 是否隐藏（前端使用） - */ - private Boolean hidden; - - /** - * 权限 - */ - private String permission; - - /** - * 是否特殊菜单 - */ - private Boolean isSpecial; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/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 deleted file mode 100644 index a5048e2e706d8075a33d5ddad36d74bbffd9cdd5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModuleTenant.java +++ /dev/null @@ -1,42 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 租户和系统模块关系表 - *

- * - * @author zmj - */ -@Data -@TableName("sys_module_tenant") -public class SysModuleTenant extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysModuleTenant"; - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 模块ID - */ - private Integer moduleId; - - /** - * 租户ID - */ - private Integer tenantId; - - /** - * 过期时间 - */ - private LocalDateTime expireTime; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e7d90c5b03033c26ed7fb65d3828e68d275ccf6d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotice.java +++ /dev/null @@ -1,100 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 系统通知 - *

- * - * @author zmj - */ -@Data -@TableName("sys_notice") -public class SysNotice extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysNotice"; - private static final long serialVersionUID = 1L; - /** - * ID - */ - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 内容 - */ - private String content; - - /** - * 状态 - */ - private Boolean available; - - /** - * 是否发布 - */ - private Boolean published; - - /** - * 创建人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; - - /** - * 已读人数 - */ - private Integer readedNum; - - /** - * 未读人数 - */ - private Integer unReadNum; - - /** - * 发布时间 - */ - private LocalDateTime publishTime; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7b0821fffe1d1924a837dbdcc424c5e0ba87891b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNoticeLog.java +++ /dev/null @@ -1,47 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 系统通知记录 - *

- * - * @author zmj - */ -@Data -@TableName("sys_notice_log") -public class SysNoticeLog extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysNoticeLog"; - private static final long serialVersionUID = 1L; - /** - * ID - */ - private String id; - - /** - * 标题 - */ - private String noticeId; - - /** - * 用户ID - */ - private String userId; - - /** - * 是否已读 - */ - private Boolean readed; - - /** - * 已读时间 - */ - private LocalDateTime readTime; - -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroup.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroup.java deleted file mode 100644 index 1c7d8524fc5a150dbc84cd6adab52d3ec9e7ffa2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroup.java +++ /dev/null @@ -1,92 +0,0 @@ -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.SysNotifyReceiverType; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 消息通知组 - *

- * - * @author zmj - */ -@Data -@TableName("sys_notify_group") -public class SysNotifyGroup extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysNotifyGroup"; - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 接收者类型 - */ - private SysNotifyReceiverType receiverType; - - /** - * 消息类型 - */ - private String messageType; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroupReceiver.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroupReceiver.java deleted file mode 100644 index bec82e9856835ad3236a53254f3326b49789c625..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroupReceiver.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.entity; - -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_notify_group_receiver") -public class SysNotifyGroupReceiver extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 消息通知组ID - */ - private String groupId; - - /** - * 接收者ID - */ - private String receiverId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a102dc694d7df39d32720a7c4beae36fd210047b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysOpenDomain.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.lframework.xingyun.template.inner.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 开放域 - *

- * - * @author zmj - * @since 2021-07-02 - */ -@Data -@TableName("sys_open_domain") -public class SysOpenDomain extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysOpenDomain"; - - /** - * ID - */ - @TableId(type = IdType.AUTO) - private String id; - - /** - * 名称 - */ - private String name; - - /** - * API密钥 - */ - private String apiSecret; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 租户ID - */ - private Integer tenantId; - - /** - * 创建人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-sys/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 deleted file mode 100644 index be23f72e34807012aa91a4891c2fd1b063518366..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysParameter.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.lframework.xingyun.template.inner.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 系统参数 - *

- * - * @author zmj - */ -@Data -@TableName("sys_parameter") -public class SysParameter extends BaseEntity implements BaseDto { - - public static final String CACHE_NAME = "SysParameter"; - private static final long serialVersionUID = 1L; - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 键 - */ - private String pmKey; - - /** - * 值 - */ - private String pmValue; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 75595053c8ef42846d05f2c54e5427d0d140e0eb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRole.java +++ /dev/null @@ -1,92 +0,0 @@ -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-07-02 - */ -@Data -@TableName("sys_role") -public class SysRole extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysRole"; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 权限 - */ - private String permission; - - /** - * 状态 - */ - private Boolean available; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-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 deleted file mode 100644 index 7cc5b23ebd0a675d74d0c36b5d468caa308ed523..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysSiteMessage.java +++ /dev/null @@ -1,96 +0,0 @@ -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-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUser.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUser.java deleted file mode 100644 index 9361b441fcc4ce983021a31ee37cb6fe560f3923..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUser.java +++ /dev/null @@ -1,118 +0,0 @@ -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.core.enums.Gender; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-07-04 - */ -@Data -@TableName("sys_user") -public class SysUser extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysUser"; - - /** - * ID - */ - private String id; - - /** - * 编号 - */ - private String code; - - /** - * 姓名 - */ - private String name; - - /** - * 用户名 - */ - private String username; - - /** - * 密码 - */ - private String password; - - /** - * 邮箱 - */ - private String email; - - /** - * 联系电话 - */ - private String telephone; - - /** - * 性别 0-未知 1-男 2-女 - */ - private Gender gender; - - /** - * 状态 1-在用 0停用 - */ - private Boolean available; - - /** - * 锁定状态 - */ - private Boolean lockStatus; - - /** - * 备注 - */ - private String description; - - /** - * 创建人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-sys/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 deleted file mode 100644 index 9a9579b22155746ed61fc42e40e0dc863e29a1a0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserDept.java +++ /dev/null @@ -1,38 +0,0 @@ -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 lombok.Data; - -/** - *

- * - *

- * - * @author zmj - * @since 2021-07-04 - */ -@Data -@TableName("sys_user_dept") -public class SysUserDept extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "SysUserDept"; - - /** - * ID - */ - private String id; - - /** - * 用户ID - */ - private String userId; - - /** - * 部门ID - */ - private String deptId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2d9be92ec569c08b143fef65e0ef59a0c802cae2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserTelephone.java +++ /dev/null @@ -1,28 +0,0 @@ -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 lombok.Data; - -@Data -@TableName("sys_user_telephone") -public class SysUserTelephone extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 手机号 - */ - private String telephone; - - /** - * 用户ID - */ - private String userId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b4212351404d77f4b4888d7e4937a0f882b5f50c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/Tenant.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.lframework.xingyun.template.inner.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -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 java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 租户 - *

- * - * @author zmj - * @since 2023-03-05 - */ -@Data -@TableName("tenant") -public class Tenant extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "Tenant"; - - /** - * ID - */ - @TableId(type = IdType.AUTO) - private Integer id; - - /** - * 名称 - */ - private String name; - - /** - * JdbcUrl - */ - private String jdbcUrl; - - /** - * Jdbc用户名 - */ - private String jdbcUsername; - - /** - * Jdbc密码 - */ - private String jdbcPassword; - - /** - * 状态 - */ - private Boolean available; - - /** - * 创建时间 新增时赋值 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; - - /** - * 修改时间 新增和修改时赋值 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime updateTime; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 30469f09fe81b54a846e8e697e793136e2b6b3b3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/QrtzJobType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -/** - * @author zmj - * @since 2022/8/20 - */ -public enum QrtzJobType implements BaseEnum { - EXCUTE_CLASS(1, "指定类"), - GROOVY(2, "Groovy脚本"); - - @EnumValue - private final Integer code; - - private final String desc; - - QrtzJobType(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-sys/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 deleted file mode 100644 index f0b2066e91404d9969bf95c61af54c8b1549cfc4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/TriggerState.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lframework.xingyun.template.inner.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum TriggerState implements BaseEnum { - WAITING("WAITING", "等待执行"), - PAUSED("PAUSED", "暂停执行"), - ACQUIRED("ACQUIRED", "正常执行"), - BLOCKED("BLOCKED", "阻塞"), - ERROR("ERROR", "执行错误"), - COMPLETE("COMPLETE", "执行完毕"), - PAUSED_BLOCKED("PAUSED_BLOCKED", "阻塞暂停"); - - @EnumValue - private final String code; - - private final String desc; - - TriggerState(String code, String desc) { - this.code = code; - this.desc = desc; - } - - @Override - public String getCode() { - return this.code; - } - - @Override - public String getDesc() { - return this.desc; - } -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionDataBizType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionDataBizType.java deleted file mode 100644 index 42c67e4735ebcb8e92d113a1be0e4260af62c645..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionDataBizType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysDataPermissionDataBizType implements BaseEnum { - ROLE(0, "角色"), DEPT(1, "部门"), USER(2, "用户"); - - @EnumValue - private final Integer code; - - private final String desc; - - SysDataPermissionDataBizType(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-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailCalcType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailCalcType.java deleted file mode 100644 index 593cc836b6723842c27f23663439045f17ae6c96..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailCalcType.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysDataPermissionModelDetailCalcType implements BaseEnum { - - AND(1, "AND", "并且"), OR(2, "OR", "或者"); - - @EnumValue - private final Integer code; - - private String operation; - - private final String desc; - - SysDataPermissionModelDetailCalcType(Integer code, String operation, String desc) { - - this.code = code; - this.operation = operation; - this.desc = desc; - } - - @Override - public Integer getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } - - public String getOperation() { - return operation; - } -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailConditionType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailConditionType.java deleted file mode 100644 index 53fe526a990b37f4fc4214de9e4228771018827d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailConditionType.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysDataPermissionModelDetailConditionType implements BaseEnum { - - EQ(0, "=", "等于"), GT(1, ">", "大于"), GE(2, ">=", "大于或等于"), LT(3, "<", "小于"), LE(4, "<=", - "小于或等于"), NE(5, - "!=", "不等于"), IN(6, "IN", "在列表中"), NOT_IN(7, - "NOT IN", "不在列表中"), LEFT_LIKE(8, "LIKE", "结尾"), RIGHT_LIKE(9, "LIKE", - "开头"), AROUND_LIKE(10, "LIKE", "包含"); - - @EnumValue - private final Integer code; - - private final String operation; - - private final String desc; - - SysDataPermissionModelDetailConditionType(Integer code, String operation, String desc) { - - this.code = code; - this.operation = operation; - this.desc = desc; - } - - @Override - public Integer getCode() { - - return this.code; - } - - @Override - public String getDesc() { - - return this.desc; - } - - public String getOperation() { - return operation; - } -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailInputType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailInputType.java deleted file mode 100644 index 1479ca19cdd9aa8aa0b9ce8f0e2cb5c93ed96acb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailInputType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysDataPermissionModelDetailInputType implements BaseEnum { - - INPUT(0, "输入框"), SELECT(1, "选择器"), DATE_TIME(2, "日期时间选择器"), DATE(3, - "日期选择器"), SQL(99, "SQL"); - - @EnumValue - private final Integer code; - - private final String desc; - - SysDataPermissionModelDetailInputType(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-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailNodeType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailNodeType.java deleted file mode 100644 index cd2f3f0df6abcf65ae22264bd9f6fef21f27b86d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailNodeType.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysDataPermissionModelDetailNodeType implements BaseEnum { - - CALC(1, "运算节点"), CONDITION(2, "条件节点"); - - @EnumValue - private final Integer code; - - private final String desc; - - SysDataPermissionModelDetailNodeType(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-sys/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 deleted file mode 100644 index 808b43c87756032e6324b63ccaf20bbce04b241e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.lframework.xingyun.core.enums.NodeType; -import java.io.Serializable; -import org.springframework.stereotype.Component; - -@Component -public final class SysDeptNodeType implements NodeType, Serializable { - - private static final long serialVersionUID = 1L; - - @Override - public Integer getCode() { - - return 1; - } - - @Override - public String getDesc() { - - return "部门"; - } -} 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 deleted file mode 100644 index 3f5685697aa4a5541765613936f17367186963b6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMailMessageSendStatus.java +++ /dev/null @@ -1,32 +0,0 @@ -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-sys/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 deleted file mode 100644 index 961bce11b7306775150736ea1f93c34361831219..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuComponentType.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysMenuComponentType implements BaseEnum { - - NORMAL(0, "普通"), CUSTOM_LIST(1, "自定义列表"), CUSTOM_PAGE(3, "自定义页面"); - - @EnumValue - private final Integer code; - - private final String desc; - - SysMenuComponentType(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-sys/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 deleted file mode 100644 index 10bdfde8912ad06cf402d9bf57aa0a3339ecabc0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuDisplay.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysMenuDisplay implements BaseEnum { - - CATALOG(0, "目录"), FUNCTION(1, "菜单"), PERMISSION(2, "权限"); - - @EnumValue - private final Integer code; - - private final String desc; - - SysMenuDisplay(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-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyMessageType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyMessageType.java deleted file mode 100644 index ec24ef1663e76e475748dbba717b07bcf54ada53..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyMessageType.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.enums.system; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.lframework.starter.web.enums.BaseEnum; - -public enum SysNotifyMessageType implements BaseEnum { - - SYS(0, "站内信"), EMAIL(1, "邮件"); - - @EnumValue - private final Integer code; - - private final String desc; - - SysNotifyMessageType(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-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 deleted file mode 100644 index 817944f71aa152cf85247fae3377b134d4bbbf84..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyReceiverType.java +++ /dev/null @@ -1,32 +0,0 @@ -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-sys/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 deleted file mode 100644 index 9798de08d71e514ad3482c191618519095b9c38c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java +++ /dev/null @@ -1,83 +0,0 @@ -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.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; -import com.lframework.xingyun.template.inner.service.SysModuleTenantService; -import com.lframework.xingyun.template.inner.service.system.SysMenuService; -import java.util.List; -import java.util.Set; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; - -/** - * 所有UserDetailsService都需要继承此类 如果需要更改用户表，那么继承此类注册Bean即可 - * - * @author zmj - */ -@Slf4j -public abstract class AbstractUserDetailsService implements UserDetailsService { - - @Autowired - private SysMenuService sysMenuService; - - @Autowired - private SysModuleTenantService sysModuleTenantService; - - @Value("${remove-fixed-permissions:false}") - private Boolean removeFixedPermission; - - @Override - public AbstractUserDetails loadUserByUsername(String username) throws UserLoginException { - - //根据登录名查询 - AbstractUserDetails userDetails = this.findByUsername(username); - - if (ObjectUtil.isEmpty(userDetails)) { - log.debug("用户名 {} 不存在", username); - throw new UserLoginException("用户名或密码错误！"); - } - - userDetails.setTenantId(TenantContextHolder.getTenantId()); - - //获取登录IP - userDetails.setIp(RequestUtil.getRequestIp()); - - // 先查询当前租户使用的module - List moduleIds = null; - if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( - TenantContextHolder.getTenantId()); - } - - // 先取角色的权限 - userDetails.setPermissions(sysMenuService.getRolePermissionByUserId(userDetails.getId())); - userDetails.setIsAdmin( - userDetails.getPermissions().contains(SecurityConstants.PERMISSION_ADMIN_NAME)); - // 再取菜单的权限 - Set permissions = sysMenuService.getPermissionsByUserId(userDetails.getId(), - userDetails.isAdmin(), moduleIds); - // 合并权限 - permissions.addAll(userDetails.getPermissions()); - if (this.removeFixedPermission) { - permissions.remove(SecurityConstants.PERMISSION_ADMIN_NAME); - } - userDetails.setPermissions(permissions); - - return userDetails; - } - - /** - * 根据登录名查询 - * - * @param username - * @return - */ - public abstract AbstractUserDetails findByUsername(String username); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d5fe19fdeb018f386408b5a39a6622d32b76dd3a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java +++ /dev/null @@ -1,201 +0,0 @@ -package com.lframework.xingyun.template.inner.impl; - -import cn.hutool.core.exceptions.UtilException; -import com.baomidou.dynamic.datasource.annotation.DS; -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.ReflectUtil; -import com.lframework.starter.common.utils.StringUtil; -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.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; -import com.lframework.xingyun.template.inner.mappers.QrtzMapper; -import com.lframework.xingyun.template.inner.service.QrtzService; -import com.lframework.xingyun.template.inner.vo.qrtz.CreateQrtzVo; -import com.lframework.xingyun.template.inner.vo.qrtz.QueryQrtzVo; -import com.lframework.xingyun.template.inner.vo.qrtz.UpdateQrtzVo; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import lombok.extern.slf4j.Slf4j; -import org.quartz.JobDetail; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @author zmj - * @since 2022/8/20 - */ -@Slf4j -@DS("master") -@Service -public class QrtzServiceImpl implements QrtzService { - - @Autowired - private QrtzMapper qrtzMapper; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryQrtzVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - vo.setJobClasses(new ArrayList<>()); - vo.getJobClasses().add(DynamicQrtzJob.class.getName()); - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = qrtzMapper.query(vo); - PageResult pageResult = PageResultUtil.convert(new PageInfo<>(datas)); - datas.stream().forEach(this::renderDto); - - return pageResult; - } - - @Override - public QrtzDto findById(String name, String group) { - QrtzDto data = qrtzMapper.findById(name, group); - if (data == null) { - return null; - } - - return renderDto(data); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void create(CreateQrtzVo vo) { - JobDetail jobDetail = QrtzHandler.getJob(vo.getName(), vo.getGroup()); - if (jobDetail != null) { - throw new DefaultClientException("名称、组不允许重复，请重新输入！"); - } - QrtzJobType jobType = EnumUtil.getByCode(QrtzJobType.class, vo.getJobType()); - if (jobType == QrtzJobType.EXCUTE_CLASS) { - if (StringUtil.isBlank(vo.getTargetClassName())) { - throw new DefaultClientException("类名不能为空！"); - } - if (StringUtil.isBlank(vo.getTargetMethodName())) { - throw new DefaultClientException("方法名不能为空！"); - } - - if (!CollectionUtil.isEmpty(vo.getTargetParamTypes()) || !CollectionUtil.isEmpty( - vo.getTargetParams())) { - int typeSize = vo.getTargetParamTypes() == null ? 0 : vo.getTargetParamTypes().size(); - int paramSize = vo.getTargetParams() == null ? 0 : vo.getTargetParams().size(); - if (typeSize != paramSize) { - throw new DefaultClientException("参数类型与参数数量不匹配！"); - } - } - try { - Class clazz = Class.forName(vo.getTargetClassName()); - ReflectUtil.newInstance(clazz); - Class[] paramTypes = null; - if (!CollectionUtil.isEmpty(vo.getTargetParamTypes())) { - paramTypes = new Class[vo.getTargetParamTypes().size()]; - for (int i = 0; i < vo.getTargetParamTypes().size(); i++) { - String targetParamType = vo.getTargetParamTypes().get(i); - try { - paramTypes[i] = Class.forName(targetParamType); - } catch (ClassNotFoundException e) { - throw new DefaultClientException( - "参数类型：" + targetParamType + "不存在，需要输入类型全名称，如：java.lang.String，请检查！"); - } - } - } - // 验证一下参数 - ReflectUtil.getMethod(clazz, vo.getTargetMethodName(), paramTypes); - - Map jobDataMap = new HashMap<>(); - jobDataMap.put("targetClassName", vo.getTargetClassName()); - jobDataMap.put("targetMethodName", vo.getTargetMethodName()); - jobDataMap.put("targetParamTypes", vo.getTargetParamTypes()); - jobDataMap.put("targetParams", vo.getTargetParams()); - jobDataMap.put("jobType", vo.getJobType()); - if (vo.getTenantId() != null) { - jobDataMap.put(StringPool.TENANT_ID_QRTZ, vo.getTenantId()); - } - - QrtzHandler.addJob(vo.getName(), vo.getGroup(), DynamicQrtzJob.class, - "custom_trigger_" + vo.getName(), vo.getGroup(), vo.getCron(), jobDataMap, - vo.getDescription()); - } catch (ClassNotFoundException e) { - throw new DefaultClientException("类：" + vo.getTargetClassName() + "不存在，请检查！"); - } catch (UtilException e) { - throw new DefaultClientException("类：" + vo.getTargetClassName() + "无法加载，请检查！"); - } - } else { - Map jobDataMap = new HashMap<>(); - jobDataMap.put("script", vo.getScript()); - jobDataMap.put("jobType", vo.getJobType()); - if (vo.getTenantId() != null) { - jobDataMap.put(StringPool.TENANT_ID_QRTZ, vo.getTenantId()); - } - - QrtzHandler.addJob(vo.getName(), vo.getGroup(), DynamicQrtzJob.class, - "custom_trigger_" + vo.getName(), vo.getGroup(), vo.getCron(), jobDataMap, - vo.getDescription()); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateQrtzVo vo) { - JobDetail jobDetail = QrtzHandler.getJob(vo.getOriName(), vo.getOriGroup()); - if (jobDetail == null) { - throw new DefaultClientException("任务不存在！"); - } - - this.delete(vo.getOriName(), vo.getOriGroup()); - - this.create(vo); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void resume(String name, String group) { - QrtzHandler.resume(name, group); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void pause(String name, String group) { - QrtzHandler.pause(name, group); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void trigger(String name, String group) { - QrtzHandler.trigger(name, group); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void delete(String name, String group) { - - QrtzHandler.deleteJob(name, group, "custom_trigger_" + name, group); - } - - private QrtzDto renderDto(QrtzDto data) { - JobDetail jobDetail = QrtzHandler.getJob(data.getName(), data.getGroup()); - Integer jobType = jobDetail.getJobDataMap().getIntValue("jobType"); - data.setJobType(EnumUtil.getByCode(QrtzJobType.class, jobType)); - data.setTargetClassName(jobDetail.getJobDataMap().getString("targetClassName")); - data.setTargetMethodName(jobDetail.getJobDataMap().getString("targetMethodName")); - data.setTargetParamTypes((List) jobDetail.getJobDataMap().get("targetParamTypes")); - data.setTargetParams((List) jobDetail.getJobDataMap().get("targetParams")); - data.setScript(jobDetail.getJobDataMap().getString("script")); - Object tenantStr = jobDetail.getJobDataMap().get(StringPool.TENANT_ID_QRTZ); - data.setTenantId(tenantStr == null ? null : Integer.valueOf(String.valueOf(tenantStr))); - - return data; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a782082145e7f115a8c06ff6d22d3c2f7bda5241..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.template.inner.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.template.inner.entity.SysModule; -import com.lframework.xingyun.template.inner.mappers.SysModuleMapper; -import com.lframework.xingyun.template.inner.service.SysModuleService; -import org.springframework.stereotype.Service; - -@DS("master") -@Service -public class SysModuleServiceImpl extends BaseMpServiceImpl implements - SysModuleService { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9e3fd2eea51be5eb8fa4f63c478212877f57926a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleTenantServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -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.toolkit.Wrappers; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.DateUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.template.inner.entity.SysModuleTenant; -import com.lframework.xingyun.template.inner.mappers.SysModuleTenantMapper; -import com.lframework.xingyun.template.inner.service.SysModuleTenantService; -import com.lframework.xingyun.template.inner.vo.system.module.SysModuleTenantVo; -import com.lframework.starter.web.utils.IdUtil; -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@DS("master") -@Service -public class SysModuleTenantServiceImpl extends - BaseMpServiceImpl implements SysModuleTenantService { - - @Override - public List getAvailableModuleIdsByTenantId(Integer tenantId) { - SysModuleTenantService thisService = getThis(getClass()); - return thisService.getByTenantId(tenantId).stream() - .filter(t -> DateUtil.now().isBefore(t.getExpireTime())).map(SysModuleTenant::getModuleId) - .collect(Collectors.toList()); - } - - @Cacheable(value = SysModuleTenant.CACHE_NAME, key = "#tenantId", unless = "#result == null or #result.isEmpty()") - @Override - public List getByTenantId(Integer tenantId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysModuleTenant.class) - .eq(SysModuleTenant::getTenantId, tenantId); - return this.list(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void setting(SysModuleTenantVo vo) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysModuleTenant.class) - .eq(SysModuleTenant::getTenantId, vo.getTenantId()); - this.remove(queryWrapper); - - if (CollectionUtil.isNotEmpty(vo.getModules())) { - List records = vo.getModules().stream().map(t -> { - SysModuleTenant record = new SysModuleTenant(); - record.setId(IdUtil.getId()); - record.setModuleId(t.getModuleId()); - record.setTenantId(vo.getTenantId()); - record.setExpireTime(t.getExpireTime()); - - return record; - }).collect(Collectors.toList()); - - this.saveBatch(records); - } - } - - @CacheEvict(value = SysModuleTenant.CACHE_NAME, key = "#key") - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 96b757a86fcbcc4f8bee25ab4b1455d1ada9c2c0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -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; -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 java.io.Serializable; -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; - -@DS("master") -@Service -public class TenantServiceImpl extends BaseMpServiceImpl implements - TenantService { - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryTenantVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().query(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, TenantSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = Tenant.CACHE_NAME, key = "#id", unless = "#result == null") - @Override - public Tenant findById(Integer id) { - return getById(id); - } - - @Transactional(rollbackFor = Exception.class) - @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()); - record.setJdbcUsername(data.getJdbcUsername()); - record.setJdbcPassword(EncryptUtil.encrypt(data.getJdbcPassword())); - record.setAvailable(Boolean.TRUE); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateTenantVo data) { - - Tenant record = this.getById(data.getId()); - if (record == null) { - 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()); - if (StringUtil.isNotBlank(data.getJdbcUrl())) { - updateWrapper.set(Tenant::getJdbcUrl, data.getJdbcUrl()); - } - if (StringUtil.isNotBlank(data.getJdbcUsername())) { - updateWrapper.set(Tenant::getJdbcUsername, data.getJdbcUsername()); - } - if (StringUtil.isNotBlank(data.getJdbcPassword())) { - updateWrapper.set(Tenant::getJdbcPassword, EncryptUtil.encrypt(data.getJdbcPassword())); - } - - this.update(updateWrapper); - } - - @CacheEvict(value = Tenant.CACHE_NAME, key = "#key") - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2d543ec2a7afd3c35cdacb0a586cbe63d4720f77..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lframework.xingyun.template.inner.impl; - -import com.lframework.xingyun.template.inner.mappers.UserDetailsMapper; -import com.lframework.starter.web.components.security.AbstractUserDetails; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * UserDetaisService默认实现 - * - * @author zmj - */ -@Service -public class UserDetailsService extends AbstractUserDetailsService { - - @Autowired - private UserDetailsMapper userDetailsMapper; - - @Override - public AbstractUserDetails findByUsername(String username) { - - AbstractUserDetails user = userDetailsMapper.findByUsername(username); - - return user; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index eda24c528d3660d07c71aff655ae463df4d67974..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicCategoryServiceImpl.java +++ /dev/null @@ -1,130 +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.github.pagehelper.PageInfo; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.xingyun.template.inner.entity.SysDataDic; -import com.lframework.xingyun.template.inner.service.system.SysDataDicCategoryService; -import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -import com.lframework.xingyun.template.inner.vo.system.dic.category.CreateSysDataDicCategoryVo; -import com.lframework.xingyun.template.inner.vo.system.dic.category.SysDataDicCategorySelectorVo; -import com.lframework.xingyun.template.inner.vo.system.dic.category.UpdateSysDataDicCategoryVo; -import com.lframework.xingyun.template.inner.mappers.system.SysDataDicCategoryMapper; -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -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.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 SysDataDicCategoryServiceImpl extends - BaseMpServiceImpl implements - SysDataDicCategoryService { - - @Autowired - private SysDataDicService sysDataDicService; - - @Cacheable(value = SysDataDicCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + 'all'") - @Override - public List queryList() { - return getBaseMapper().query(); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - SysDataDicCategorySelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = SysDataDicCategory.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysDataDicCategory findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysDataDicCategoryVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDataDicCategory.class) - .eq(SysDataDicCategory::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysDataDicCategory.class) - .eq(SysDataDicCategory::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysDataDicCategory record = new SysDataDicCategory(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysDataDicCategoryVo vo) { - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDataDicCategory.class) - .eq(SysDataDicCategory::getCode, vo.getCode()).ne(SysDataDicCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysDataDicCategory.class) - .eq(SysDataDicCategory::getName, vo.getName()).ne(SysDataDicCategory::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysDataDicCategory record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("数据字典分类不存在！"); - } - - record.setCode(vo.getCode()); - record.setName(vo.getName()); - - this.updateById(record); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - Wrapper queryDicWrapper = Wrappers.lambdaQuery(SysDataDic.class) - .eq(SysDataDic::getCategoryId, id); - if (sysDataDicService.count(queryDicWrapper) > 0) { - throw new DefaultClientException("此分类下存在数据字典，无法删除！"); - } - - this.removeById(id); - } - - @CacheEvict(value = SysDataDicCategory.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/SysDataDicItemServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicItemServiceImpl.java deleted file mode 100644 index 55a01bbe5fa8e62a86dd57b689c31b1f901ea8ae..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicItemServiceImpl.java +++ /dev/null @@ -1,156 +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.github.pagehelper.PageInfo; -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.xingyun.template.inner.entity.SysDataDic; -import com.lframework.xingyun.template.inner.entity.SysDataDicItem; -import com.lframework.xingyun.template.inner.vo.system.dic.item.CreateSysDataDicItemVo; -import com.lframework.xingyun.template.inner.vo.system.dic.item.QuerySysDataDicItemVo; -import com.lframework.xingyun.template.inner.vo.system.dic.item.UpdateSysDataDicItemVo; -import com.lframework.xingyun.template.inner.mappers.system.SysDataDicItemMapper; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysDataDicItemService; -import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -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.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 SysDataDicItemServiceImpl extends - BaseMpServiceImpl implements SysDataDicItemService { - - @Autowired - private SysDataDicService sysDataDicService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QuerySysDataDicItemVo 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(QuerySysDataDicItemVo vo) { - return getBaseMapper().query(vo); - } - - @Cacheable(value = SysDataDicItem.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysDataDicItem findById(String id) { - return getBaseMapper().selectById(id); - } - - @Override - public SysDataDicItem findByCode(String dicCode, String code) { - SysDataDicItemService thisService = getThis(getClass()); - List items = thisService.findByDicCode(dicCode); - if (CollectionUtil.isEmpty(items)) { - return null; - } - - return items.stream().filter(t -> t.getCode().equals(code)).findFirst().orElse(null); - } - - @Cacheable(value = SysDataDicItem.CACHE_NAME, key = "@cacheVariables.tenantId() + #dicCode") - @Override - public List findByDicCode(String dicCode) { - Wrapper queryDicWrapper = Wrappers.lambdaQuery(SysDataDic.class) - .eq(SysDataDic::getCode, dicCode); - SysDataDic dic = sysDataDicService.getOne(queryDicWrapper); - if (dic == null) { - throw new DefaultClientException("数据字典不存在！"); - } - - Wrapper queryWrapper = Wrappers.lambdaQuery(SysDataDicItem.class) - .eq(SysDataDicItem::getDicId, dic.getId()).orderByAsc(SysDataDicItem::getOrderNo); - List datas = this.list(queryWrapper); - - return datas; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysDataDicItemVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDataDicItem.class) - .eq(SysDataDicItem::getDicId, vo.getDicId()) - .eq(SysDataDicItem::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysDataDicItem.class) - .eq(SysDataDicItem::getDicId, vo.getDicId()) - .eq(SysDataDicItem::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysDataDicItem record = new SysDataDicItem(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - record.setDicId(vo.getDicId()); - record.setOrderNo(vo.getOrderNo()); - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysDataDicItemVo vo) { - - SysDataDicItem record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("数据字典值不存在！"); - } - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDataDicItem.class) - .eq(SysDataDicItem::getDicId, record.getDicId()) - .eq(SysDataDicItem::getCode, vo.getCode()).ne(SysDataDicItem::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysDataDicItem.class) - .eq(SysDataDicItem::getDicId, record.getDicId()) - .eq(SysDataDicItem::getName, vo.getName()).ne(SysDataDicItem::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysDataDicItem.class) - .set(SysDataDicItem::getCode, vo.getCode()).set(SysDataDicItem::getName, vo.getName()) - .set(SysDataDicItem::getOrderNo, vo.getOrderNo()).eq(SysDataDicItem::getId, vo.getId()); - this.update(updateWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - this.removeById(id); - } - - @CacheEvict(value = SysDataDicItem.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/SysDataDicServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicServiceImpl.java deleted file mode 100644 index 1cb6066a74d373ddae139465daea7181c70744cf..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicServiceImpl.java +++ /dev/null @@ -1,145 +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.github.pagehelper.PageInfo; -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.xingyun.template.inner.entity.SysDataDic; -import com.lframework.xingyun.template.inner.entity.SysDataDicItem; -import com.lframework.xingyun.template.inner.service.system.SysDataDicItemService; -import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -import com.lframework.xingyun.template.inner.vo.system.dic.CreateSysDataDicVo; -import com.lframework.xingyun.template.inner.vo.system.dic.QuerySysDataDicVo; -import com.lframework.xingyun.template.inner.vo.system.dic.SysDataDicSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.dic.UpdateSysDataDicVo; -import com.lframework.xingyun.template.inner.mappers.system.SysDataDicMapper; -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.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 SysDataDicServiceImpl extends - BaseMpServiceImpl implements - SysDataDicService { - - @Autowired - private SysDataDicItemService sysDataDicItemService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QuerySysDataDicVo 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(QuerySysDataDicVo vo) { - return getBaseMapper().query(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - SysDataDicSelectorVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = SysDataDic.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysDataDic findById(String id) { - return getBaseMapper().selectById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysDataDicVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDataDic.class) - .eq(SysDataDic::getCode, vo.getCode()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysDataDic.class) - .eq(SysDataDic::getName, vo.getName()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysDataDic record = new SysDataDic(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - if (!StringUtil.isBlank(vo.getCategoryId())) { - record.setCategoryId(vo.getCategoryId()); - } - - this.save(record); - - return record.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysDataDicVo vo) { - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDataDic.class) - .eq(SysDataDic::getCode, vo.getCode()).ne(SysDataDic::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysDataDic.class) - .eq(SysDataDic::getName, vo.getName()).ne(SysDataDic::getId, vo.getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysDataDic record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("数据字典不存在！"); - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysDataDic.class) - .set(SysDataDic::getCode, vo.getCode()).set(SysDataDic::getName, vo.getName()) - .set(SysDataDic::getCategoryId, - StringUtil.isBlank(vo.getCategoryId()) ? null : vo.getCategoryId()) - .eq(SysDataDic::getId, vo.getId()); - this.update(updateWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { - - this.removeById(id); - - Wrapper deleteItemWrapper = Wrappers.lambdaQuery(SysDataDicItem.class) - .eq(SysDataDicItem::getDicId, id); - sysDataDicItemService.remove(deleteItemWrapper); - } - - @CacheEvict(value = SysDataDic.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/SysDataPermissionDataServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java deleted file mode 100644 index 689f36ba7b99cf38759279c2354a38ecb7fd9d38..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java +++ /dev/null @@ -1,33 +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.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; -import java.util.List; -import org.springframework.stereotype.Service; - -@Service -public class SysDataPermissionDataServiceImpl extends - BaseMpServiceImpl implements - SysDataPermissionDataService { - - @Override - public List getByBizId(String bizId) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysDataPermissionData.class) - .eq(SysDataPermissionData::getBizId, bizId); - - return this.list(queryWrapper); - } - - @Override - public SysDataPermissionData getByBizId(String bizId, Integer bizType, Integer permissionType) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysDataPermissionData.class) - .eq(SysDataPermissionData::getBizId, bizId).eq(SysDataPermissionData::getBizType, bizType) - .eq(SysDataPermissionData::getPermissionType, permissionType); - - return this.getOne(queryWrapper); - } -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionModelDetailServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionModelDetailServiceImpl.java deleted file mode 100644 index 8f680a13ff05e3bfd30effd99cf5fbda887e0449..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionModelDetailServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -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.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; -import org.springframework.stereotype.Service; - -@Service -public class SysDataPermissionModelDetailServiceImpl extends - BaseMpServiceImpl implements - SysDataPermissionModelDetailService { - - @Override - public String toSql(List models) { - if (CollectionUtil.isEmpty(models)) { - return null; - } - - StringBuilder builder = new StringBuilder(); - - for (SysDataPermissionModelDetailVo model : models) { - SysDataPermissionModelDetailNodeType nodeType = EnumUtil.getByCode( - SysDataPermissionModelDetailNodeType.class, model.getNodeType()); - if (nodeType == SysDataPermissionModelDetailNodeType.CALC) { - SysDataPermissionModelDetailCalcType calcType = EnumUtil.getByCode( - SysDataPermissionModelDetailCalcType.class, model.getCalcType()); - if (CollectionUtil.isNotEmpty(model.getChildren())) { - builder.append(" ("); - builder.append(this.buildChildrenSql(model.getChildren(), calcType.getOperation())); - builder.append(") "); - } - builder.append("AND "); - } else { - throw new DefaultSysException("nodeType有误，请检查！"); - } - } - - if (builder.length() > 0) { - builder.setLength(builder.length() - 4); - } - return builder.toString(); - } - - @Override - public String formatSql(String sqlTemplate, Map params) { - return StringUtil.format(sqlTemplate, params); - } - - private String buildChildrenSql(List children, String operation) { - if (CollectionUtil.isEmpty(children)) { - return ""; - } - - StringBuilder builder = new StringBuilder(); - for (SysDataPermissionModelDetailVo child : children) { - SysDataPermissionModelDetailNodeType nodeType = EnumUtil.getByCode( - SysDataPermissionModelDetailNodeType.class, child.getNodeType()); - if (nodeType == SysDataPermissionModelDetailNodeType.CALC) { - SysDataPermissionModelDetailCalcType calcType = EnumUtil.getByCode( - SysDataPermissionModelDetailCalcType.class, child.getCalcType()); - if (CollectionUtil.isNotEmpty(child.getChildren())) { - builder.append(" ("); - builder.append(this.buildChildrenSql(child.getChildren(), calcType.getOperation())); - builder.append(")"); - builder.append(operation).append(" "); - } - } else { - SysDataPermissionModelDetailConditionType conditionType = EnumUtil.getByCode( - SysDataPermissionModelDetailConditionType.class, child.getConditionType()); - SysDataPermissionModelDetail record = this.getById(child.getDetailId()); - builder.append("{").append(record.getTableName()).append("}.") - .append(record.getColumnName()).append(" ").append(conditionType.getOperation()) - .append(" ").append(this.buildLeft(conditionType)) - .append(this.buildValue(child, record)) - .append(this.buildRight(conditionType)).append(" ").append(operation).append(" "); - } - } - - if (builder.length() > 0) { - builder.setLength(builder.length() - operation.length() - 1); - } - - return builder.toString(); - } - - private String buildLeft(SysDataPermissionModelDetailConditionType conditionType) { - if (conditionType == SysDataPermissionModelDetailConditionType.IN - || conditionType == SysDataPermissionModelDetailConditionType.NOT_IN) { - return "("; - } else if (conditionType == SysDataPermissionModelDetailConditionType.LEFT_LIKE) { - return "CONCAT('%',"; - } else if (conditionType == SysDataPermissionModelDetailConditionType.RIGHT_LIKE) { - return "CONCAT("; - } else if (conditionType == SysDataPermissionModelDetailConditionType.AROUND_LIKE) { - return "CONCAT('%',"; - } - - return ""; - } - - private String buildRight(SysDataPermissionModelDetailConditionType conditionType) { - if (conditionType == SysDataPermissionModelDetailConditionType.IN - || conditionType == SysDataPermissionModelDetailConditionType.NOT_IN) { - return ")"; - } else if (conditionType == SysDataPermissionModelDetailConditionType.LEFT_LIKE) { - return ")"; - } else if (conditionType == SysDataPermissionModelDetailConditionType.RIGHT_LIKE) { - return ",'%')"; - } else if (conditionType == SysDataPermissionModelDetailConditionType.AROUND_LIKE) { - return ",'%')"; - } - - return ""; - } - - private String buildValue(SysDataPermissionModelDetailVo child, - SysDataPermissionModelDetail record) { - SysDataPermissionModelDetailConditionType conditionType = EnumUtil.getByCode( - SysDataPermissionModelDetailConditionType.class, child.getConditionType()); - if (conditionType == SysDataPermissionModelDetailConditionType.IN - || conditionType == SysDataPermissionModelDetailConditionType.NOT_IN) { - if (record.getInputType() == SysDataPermissionModelDetailInputType.SQL) { - return record.getSqlValue(); - } else { - return CollectionUtil.join( - child.getValues().stream().map(t -> "'" + t + "'").collect(Collectors.toList()), ","); - } - } - - return "'" + child.getValue() + "'"; - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7a6bd6613ffd0880f11653a5024b2417107a6977..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java +++ /dev/null @@ -1,269 +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.constants.StringPool; -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.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.IdUtil; -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.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; -import java.util.Collections; -import java.util.List; -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 SysDeptServiceImpl extends BaseMpServiceImpl implements - SysDeptService { - - @Autowired - private RecursionMappingService recursionMappingService; - - @Override - public List selector() { - - return this.doSelector(); - } - - @Cacheable(value = SysDept.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysDept findById(String id) { - - return this.doGetById(id); - } - - @Override - public SysDept findByCode(String code) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysDept.class).eq(SysDept::getCode, code); - return getOne(queryWrapper); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用部门，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - List batchIds = new ArrayList<>(); - batchIds.add(id); - List nodeChildIds = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - if (CollectionUtil.isNotEmpty(nodeChildIds)) { - batchIds.addAll(nodeChildIds); - } - - this.doBatchUnable(batchIds); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用部门，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - List batchIds = new ArrayList<>(); - batchIds.add(id); - List nodeChildIds = recursionMappingService.getNodeParentIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - if (CollectionUtil.isNotEmpty(nodeChildIds)) { - batchIds.addAll(nodeChildIds); - } - - this.doBatchEnable(batchIds); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增部门，ID：{}, 编号：{}", params = {"#id", - "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysDeptVo vo) { - - SysDept data = this.doCreate(vo); - - this.saveRecursion(data.getId(), data.getParentId()); - - 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(UpdateSysDeptVo vo) { - - this.doUpdate(vo); - - this.saveRecursion(vo.getId(), vo.getParentId()); - - OpLogUtil.setVariable("id", vo.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - protected List doSelector() { - - return getBaseMapper().selector(); - } - - protected SysDept doGetById(String id) { - - return getBaseMapper().findById(id); - } - - protected void doBatchUnable(Collection ids) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysDept.class) - .set(SysDept::getAvailable, Boolean.FALSE).in(SysDept::getId, ids); - getBaseMapper().update(updateWrapper); - } - - protected void doBatchEnable(Collection ids) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysDept.class) - .set(SysDept::getAvailable, Boolean.TRUE).in(SysDept::getId, ids); - getBaseMapper().update(updateWrapper); - } - - protected SysDept doCreate(CreateSysDeptVo vo) { - - //查询Code是否重复 - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDept.class) - .eq(SysDept::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - //查询Name是否重复 - checkWrapper = Wrappers.lambdaQuery(SysDept.class) - .eq(SysDept::getName, vo.getName()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysDept parentDept = null; - //如果parentId不为空，查询上级部门是否存在 - if (!StringUtil.isBlank(vo.getParentId())) { - parentDept = this.getById(vo.getParentId()); - if (parentDept == null) { - throw new DefaultClientException("上级部门不存在，请检查！"); - } - } - - SysDept data = new SysDept(); - data.setId(IdUtil.getId()); - data.setCode(vo.getCode()); - data.setName(vo.getName()); - data.setShortName(vo.getShortName()); - if (!StringUtil.isBlank(vo.getParentId())) { - data.setParentId(vo.getParentId()); - } - data.setAvailable(parentDept == null ? Boolean.TRUE : parentDept.getAvailable()); - data.setDescription(vo.getDescription()); - - getBaseMapper().insert(data); - - return data; - } - - protected void doUpdate(UpdateSysDeptVo vo) { - - SysDept data = this.findById(vo.getId()); - if (data == null) { - throw new DefaultClientException("部门不存在！"); - } - - //查询Code是否重复 - Wrapper checkWrapper = Wrappers.lambdaQuery(SysDept.class) - .eq(SysDept::getCode, vo.getCode()).ne(SysDept::getId, data.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - //查询Name是否重复 - checkWrapper = Wrappers.lambdaQuery(SysDept.class) - .eq(SysDept::getName, vo.getName()) - .ne(SysDept::getId, data.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - //如果parentId不为空，查询上级部门是否存在 - if (!StringUtil.isBlank(vo.getParentId())) { - if (ObjectUtil.equals(vo.getParentId(), data.getId())) { - throw new DefaultClientException("上级部门不能是当前部门！"); - } - Wrapper checkParentWrapper = Wrappers.lambdaQuery(SysDept.class) - .eq(SysDept::getId, vo.getParentId()); - if (getBaseMapper().selectCount(checkParentWrapper) == 0) { - throw new DefaultClientException("上级部门不存在，请检查！"); - } - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysDept.class) - .set(SysDept::getCode, vo.getCode()).set(SysDept::getName, vo.getName()) - .set(SysDept::getShortName, vo.getShortName()) - .set(SysDept::getParentId, - StringUtil.isBlank(vo.getParentId()) ? null : vo.getParentId()) - .set(SysDept::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .set(SysDept::getAvailable, vo.getAvailable()).eq(SysDept::getId, vo.getId()); - - getBaseMapper().update(updateWrapper); - - if (vo.getAvailable()) { - this.enable(vo.getId()); - } else { - this.unable(vo.getId()); - } - } - - /** - * 保存递归信息 - * - * @param deptId - * @param parentId - */ - protected void saveRecursion(String deptId, String parentId) { - - if (!StringUtil.isBlank(parentId)) { - List parentIds = recursionMappingService.getNodeParentIds(parentId, - ApplicationUtil.getBean(SysDeptNodeType.class)); - if (CollectionUtil.isEmpty(parentIds)) { - parentIds = new ArrayList<>(); - } - parentIds.add(parentId); - - recursionMappingService.saveNode(deptId, ApplicationUtil.getBean(SysDeptNodeType.class), - parentIds); - } else { - recursionMappingService.saveNode(deptId, ApplicationUtil.getBean(SysDeptNodeType.class)); - } - } - - @CacheEvict(value = {SysDept.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/SysGenerateCodeServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysGenerateCodeServiceImpl.java deleted file mode 100644 index 22a40d872f93d44f61762a45d305e06a24dfee17..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysGenerateCodeServiceImpl.java +++ /dev/null @@ -1,141 +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.ObjectUtil; -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.core.annotations.OpLog; -import com.lframework.xingyun.core.dto.GenerateCodeDto; -import com.lframework.xingyun.core.enums.DefaultOpLogType; -import com.lframework.xingyun.core.utils.OpLogUtil; -import com.lframework.xingyun.template.inner.entity.SysGenerateCode; -import com.lframework.xingyun.template.inner.mappers.system.SysGenerateCodeMapper; -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.QuerySysGenerateCodeVo; -import com.lframework.xingyun.template.inner.vo.system.generate.SettingSysGenerateCodeVo; -import com.lframework.xingyun.template.inner.vo.system.generate.UpdateSysGenerateCodeVo; -import java.io.Serializable; -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 SysGenerateCodeServiceImpl 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 deleted file mode 100644 index 8a7c32ac692aee073cb920c9eec4d141b08f6f48..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMailMessageServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -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-sys/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 deleted file mode 100644 index 76522a5735ffd03302a17954ab6ee539666ef84b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java +++ /dev/null @@ -1,474 +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.constants.StringPool; -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.RegUtil; -import com.lframework.starter.common.utils.StringUtil; -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.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 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; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - *

- * 系统菜单 服务实现类 - *

- * - * @author zmj - * @since 2021-05-10 - */ -@Service -public class SysMenuServiceImpl extends BaseMpServiceImpl implements - SysMenuService { - - private String tokenKey = "X-Auth-Token"; - - @Autowired - private IUserTokenResolver userTokenResolver; - - @Override - public List queryList(List moduleIds) { - - return this.doQuery(moduleIds); - } - - @Override - public List getByRoleId(String roleId, List moduleIds) { - - return this.doGetByRoleId(roleId, moduleIds); - } - - @Cacheable(value = SysMenu.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysMenu findById(@NonNull String id) { - - return this.doGetById(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增菜单，ID：{}, 编号：{}", params = {"#id", - "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(@NonNull CreateSysMenuVo vo) { - - SysMenu 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(@NonNull UpdateSysMenuVo vo) { - - SysMenu oriMenu = this.findById(vo.getId()); - - if (!ObjectUtil.equals(vo.getDisplay(), oriMenu.getDisplay().getCode())) { - throw new DefaultClientException("菜单【" + oriMenu.getTitle() + "】" + "不允许更改类型！"); - } - - SysMenu data = this.doUpdate(vo); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "删除菜单，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(@NonNull String id) { - - SysMenu oriMenu = this.findById(id); - - List children = this.doGetChildrenById(id); - if (CollectionUtil.isNotEmpty(children)) { - //如果子节点不为空 - throw new DefaultClientException("菜单【" + oriMenu.getTitle() + "】存在子菜单，无法删除！"); - } - - this.doDeleteById(id); - } - - @Override - public List selector(SysMenuSelectorVo vo, List moduleIds) { - - return this.doSelector(vo, moduleIds); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用菜单，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(@NonNull String id) { - - this.doEnable(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用菜单，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(@NonNull String id) { - - this.doUnable(id); - } - - @Override - public Boolean existPermission(String permission) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysMenu.class) - .eq(SysMenu::getPermission, permission); - return this.count(queryWrapper) > 0; - } - - protected List doQuery(List moduleIds) { - - return getBaseMapper().query(moduleIds); - } - - protected List doGetByRoleId(String roleId, List moduleIds) { - - return getBaseMapper().getByRoleId(roleId, moduleIds); - } - - protected SysMenu doGetById(@NonNull String id) { - - return getBaseMapper().findById(id); - } - - protected SysMenu doCreate(@NonNull CreateSysMenuVo vo) { - - SysMenu data = new SysMenu(); - - data.setId(IdUtil.getId()); - this.setDataForCreate(vo, data); - - getBaseMapper().insert(data); - - return data; - } - - protected SysMenu doUpdate(@NonNull UpdateSysMenuVo vo) { - - SysMenu data = new SysMenu(); - - data.setId(vo.getId()); - - this.setDataForCreate(vo, data); - - data.setAvailable(vo.getAvailable()); - - SysMenuService thisService = getThis(this.getClass()); - - SysMenu record = thisService.findById(vo.getId()); - - data.setIsSpecial(record.getIsSpecial()); - - getBaseMapper().deleteById(vo.getId()); - - getBaseMapper().insert(data); - - return data; - } - - protected void doDeleteById(@NonNull String id) { - - getBaseMapper().deleteById(id); - } - - protected List doSelector(SysMenuSelectorVo vo, List moduleIds) { - - return getBaseMapper().selector(vo, moduleIds); - } - - 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 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); - getBaseMapper().update(new SysMenu(), wrapper); - } - - protected void setDataForCreate(@NonNull CreateSysMenuVo vo, @NonNull SysMenu data) { - - SysMenuDisplay sysMenuDisplay = EnumUtil.getByCode(SysMenuDisplay.class, vo.getDisplay()); - - SysMenu parentMenu = null; - if (!StringUtil.isBlank(vo.getParentId())) { - parentMenu = this.findById(vo.getParentId()); - if (parentMenu == null) { - throw new DefaultClientException("父级菜单不存在！"); - } - if (parentMenu.getId().equals(data.getId())) { - throw new DefaultClientException("父级菜单不能是当前菜单！"); - } - } - data.setCode(vo.getCode()); - data.setTitle(vo.getTitle()); - // fix 这里需要用null代替空字符串 - data.setParentId(parentMenu == null ? null : parentMenu.getId()); - data.setDisplay(sysMenuDisplay); - data.setDescription( - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - if (sysMenuDisplay == SysMenuDisplay.CATALOG || sysMenuDisplay == SysMenuDisplay.FUNCTION) { - if (parentMenu != null) { - //父级菜单必须是目录 - if (parentMenu.getDisplay() != SysMenuDisplay.CATALOG) { - throw new DefaultClientException( - "父级菜单类型必须是【" + SysMenuDisplay.CATALOG.getDesc() + "】！"); - } - } - - data.setName(vo.getName()); - data.setIcon(vo.getIcon()); - data.setPath(vo.getPath()); - data.setHidden(vo.getHidden()); - - if (sysMenuDisplay == SysMenuDisplay.FUNCTION) { - // 功能必须有parentId - if (parentMenu == null) { - throw new DefaultClientException( - "此菜单类型是【" + SysMenuDisplay.FUNCTION.getDesc() + "】，父级菜单不能为空！"); - } - data.setComponent(vo.getComponent()); - data.setComponentType( - EnumUtil.getByCode(SysMenuComponentType.class, vo.getComponentType())); - data.setNoCache(vo.getNoCache()); - - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(vo.getPermission())) { - throw new DefaultClientException( - "权限【" + SecurityConstants.PERMISSION_ADMIN_NAME + "】为内置权限，请修改！"); - } - - data.setPermission(vo.getPermission()); - } - } else if (sysMenuDisplay == SysMenuDisplay.PERMISSION) { - - if (parentMenu != null) { - //父级菜单必须是目录 - if (parentMenu.getDisplay() != SysMenuDisplay.FUNCTION) { - throw new DefaultClientException( - "父级菜单类型必须是【" + SysMenuDisplay.FUNCTION.getDesc() + "】！"); - } - } else { - throw new DefaultClientException( - "此菜单类型是【" + SysMenuDisplay.PERMISSION.getDesc() + "】，父级菜单不能为空！"); - } - - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(vo.getPermission())) { - throw new DefaultClientException( - "权限【" + SecurityConstants.PERMISSION_ADMIN_NAME + "】为内置权限，请修改！"); - } - - data.setPermission(vo.getPermission()); - } - } - - protected List doGetChildrenById(String id) { - - return getBaseMapper().getChildrenById(id); - } - - @Override - public List getMenuByUserId(String userId, boolean isAdmin, List moduleIds) { - - List menus = this.doGetMenus(userId, isAdmin, moduleIds); - - List collectionMenuIds = this.doGetCollectMenuIds(userId); - - if (!CollectionUtil.isEmpty(menus)) { - // 用env渲染${xxx}属性 - menus.forEach(menu -> { - menu.setPath(ApplicationUtil.resolvePlaceholders(menu.getPath())); - }); - - // 渲染spel表达式 - Map vars = getDefaultVars(); - menus.stream().filter(menu -> this.hasSpecExpression(menu.getPath())).forEach(menu -> { - List expressions = this.getAllExpressions(menu.getPath()); - if (!CollectionUtil.isEmpty(expressions)) { - String oriPath = menu.getPath(); - for (String expression : expressions) { - Object parsed = SpelUtil.parse(expression.replaceAll("\\{", "").replaceAll("}", ""), - vars); - oriPath = oriPath.replace(expression, parsed == null ? "" : String.valueOf(parsed)); - } - - menu.setPath(oriPath); - } - }); - - if (!CollectionUtil.isEmpty(collectionMenuIds)) { - menus.forEach(menu -> { - menu.setIsCollect(collectionMenuIds.contains(menu.getId())); - }); - } - } - - return menus; - } - - @Override - public Set getPermissionsByUserId(String userId, boolean isAdmin, - List moduleIds) { - - return getBaseMapper().getPermissionsByUserId(userId, isAdmin, moduleIds); - } - - @Override - public Set getRolePermissionByUserId(String userId) { - return getBaseMapper().getRolePermissionByUserId(userId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void collect(String userId, String menuId) { - - if (StringUtil.isBlank(userId) || StringUtil.isBlank(menuId)) { - return; - } - - this.cancelCollect(userId, menuId); - - getBaseMapper().collectMenu(IdUtil.getId(), userId, menuId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void cancelCollect(String userId, String menuId) { - - if (StringUtil.isBlank(userId) || StringUtil.isBlank(menuId)) { - return; - } - - getBaseMapper().cancelCollectMenu(userId, menuId); - } - - private List getAllExpressions(String s) { - - if (!this.hasSpecExpression(s)) { - return null; - } - - List results = new ArrayList<>(); - String[] arr = s.split("#\\{"); - for (int i = 1; i < arr.length; i++) { - if (!arr[i].contains("}")) { - continue; - } - results.add("#{" + arr[i].substring(0, arr[i].indexOf("}")) + "}"); - } - - return results; - } - - private boolean hasSpecExpression(String s) { - - return RegUtil.isMatch(Pattern.compile("^.*#\\{.*}.*$"), s); - } - - protected Map getDefaultVars() { - - Map vars = new HashMap<>(); - - vars.put("_token", userTokenResolver.getToken()); - vars.put("_fullToken", userTokenResolver.getFullToken()); - vars.put("_tokenKey", tokenKey); - - return vars; - } - - protected List doGetMenus(String userId, boolean isAdmin, List moduleIds) { - - return getBaseMapper().getMenuByUserId(userId, isAdmin, moduleIds); - } - - protected List doGetCollectMenuIds(String userId) { - - return getBaseMapper().getCollectMenuIds(userId); - } - - @CacheEvict(value = SysMenu.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/SysNoticeLogServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeLogServiceImpl.java deleted file mode 100644 index 1d66064b46569cef9614869f6edfec4eac8b0eda..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeLogServiceImpl.java +++ /dev/null @@ -1,28 +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.xingyun.template.inner.mappers.system.SysNoticeLogMapper; -import com.lframework.xingyun.template.inner.entity.SysNoticeLog; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.template.inner.service.system.SysNoticeLogService; -import java.time.LocalDateTime; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysNoticeLogServiceImpl extends - BaseMpServiceImpl implements SysNoticeLogService { - - @Transactional(rollbackFor = Exception.class) - @Override - public boolean setReaded(String noticeId, String userId) { - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysNoticeLog.class) - .eq(SysNoticeLog::getNoticeId, noticeId).eq(SysNoticeLog::getUserId, userId) - .eq(SysNoticeLog::getReaded, Boolean.FALSE).set(SysNoticeLog::getReaded, Boolean.TRUE) - .set(SysNoticeLog::getReadTime, - LocalDateTime.now()); - - return this.update(updateWrapper); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 06399f306eda07fc7ff7406f446ba30a16a8e304..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java +++ /dev/null @@ -1,259 +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.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.ThreadUtil; -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.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.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; -import com.lframework.xingyun.template.inner.entity.SysNoticeLog; -import com.lframework.xingyun.template.inner.vo.system.notice.CreateSysNoticeVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeByUserVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeVo; -import com.lframework.xingyun.template.inner.vo.system.notice.UpdateSysNoticeVo; -import com.lframework.xingyun.template.inner.mappers.system.SysNoticeMapper; -import com.lframework.xingyun.template.inner.service.system.SysNoticeLogService; -import com.lframework.xingyun.template.inner.service.system.SysNoticeService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; -import com.lframework.xingyun.template.inner.vo.system.user.QuerySysUserVo; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Collections; -import java.util.List; -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.context.ApplicationListener; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysNoticeServiceImpl extends BaseMpServiceImpl implements - SysNoticeService { - - @Autowired - private SysUserService sysUserService; - - @Autowired - private SysNoticeLogService sysNoticeLogService; - - @Autowired - private WsDataPusher wsDataPusher; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QuerySysNoticeVo 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(QuerySysNoticeVo vo) { - - return getBaseMapper().query(vo); - } - - @Override - public PageResult queryByUser(Integer pageIndex, Integer pageSize, - QuerySysNoticeByUserVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().queryByUser(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = SysNotice.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysNoticeDto getContent(String id) { - SysNotice record = getBaseMapper().selectById(id); - if (record == null) { - return null; - } - - return new SysNoticeDto(record); - } - - @Override - public SysNotice findById(String id) { - - return getBaseMapper().selectById(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增系统通知，ID：{}", params = {"#id"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysNoticeVo vo) { - - SysNotice data = new SysNotice(); - data.setId(IdUtil.getId()); - data.setTitle(vo.getTitle()); - data.setContent(vo.getContent()); - data.setPublished(vo.getPublished()); - - getBaseMapper().insert(data); - - if (vo.getPublished()) { - ThreadUtil.execAsync(new DefaultRunnable(() -> { - SysNoticeService thisService = getThis(getClass()); - thisService.publish(data.getId()); - })); - } - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setExtra(vo); - - return data.getId(); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "修改系统通知，ID：{}", params = {"#id"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysNoticeVo vo) { - - SysNotice data = getBaseMapper().selectById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("系统通知不存在！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SysNotice.class) - .set(SysNotice::getTitle, vo.getTitle()).set(SysNotice::getContent, vo.getContent()) - .set(SysNotice::getAvailable, vo.getAvailable()) - .set(SysNotice::getPublished, vo.getPublished()).set(SysNotice::getPublishTime, null) - .set(SysNotice::getReadedNum, 0).set(SysNotice::getUnReadNum, 0) - .eq(SysNotice::getId, vo.getId()); - - getBaseMapper().update(updateWrapper); - - // 无论发布还是不发布 都要删除 - Wrapper deleteLogWrapper = Wrappers.lambdaQuery(SysNoticeLog.class) - .eq(SysNoticeLog::getNoticeId, data.getId()); - sysNoticeLogService.remove(deleteLogWrapper); - - if (vo.getPublished()) { - ThreadUtil.execAsync(new DefaultRunnable(() -> { - SysNoticeService thisService = getThis(getClass()); - thisService.publish(data.getId()); - })); - } - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setExtra(vo); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "发布系统通知，ID：{}", params = {"#id"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void publish(String id) { - - // 查询所有用户 - QuerySysUserVo querySysUserVo = new QuerySysUserVo(); - querySysUserVo.setAvailable(true); - List users = sysUserService.query(querySysUserVo); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysNotice.class) - .eq(SysNotice::getId, id).set(SysNotice::getReadedNum, 0) - .set(SysNotice::getUnReadNum, users.size()).set(SysNotice::getPublished, Boolean.TRUE) - .set(SysNotice::getPublishTime, LocalDateTime.now()); - this.update(updateWrapper); - - Wrapper deleteLogWrapper = Wrappers.lambdaQuery(SysNoticeLog.class) - .eq(SysNoticeLog::getNoticeId, id); - sysNoticeLogService.remove(deleteLogWrapper); - - if (!CollectionUtil.isEmpty(users)) { - List logs = users.stream().map(t -> { - SysNoticeLog log = new SysNoticeLog(); - log.setId(IdUtil.getId()); - log.setNoticeId(id); - log.setUserId(t.getId()); - log.setReaded(Boolean.FALSE); - - return log; - }).collect(Collectors.toList()); - - sysNoticeLogService.saveBatch(logs); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void setReaded(String id, String userId) { - if (sysNoticeLogService.setReaded(id, userId)) { - getBaseMapper().setReaded(id); - } - } - - @Override - public void noticeForWs() { - WsPushData pushData = new WsPushData(); - pushData.setBizType("sysNotice"); - pushData.setAll(Boolean.TRUE); - - wsDataPusher.push(pushData); - } - - @Override - public void noticeForWs(String userId) { - WsPushData pushData = new WsPushData(); - pushData.setBizType("sysNotice"); - pushData.setIncludeUserId(userId); - - wsDataPusher.push(pushData); - } - - @Override - public void noticeForWsWithSessionId(String sessionId) { - WsPushData pushData = new WsPushData(); - pushData.setBizType("sysNotice"); - pushData.setIncludeSessionIds(Collections.singletonList(sessionId)); - - wsDataPusher.push(pushData); - } - - @CacheEvict(value = SysNotice.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - - } - - @Component - public static class ReloadNoticeListener implements ApplicationListener { - - @Autowired - private SysNoticeService sysNoticeService; - - @Override - public void onApplicationEvent(UserConnectEvent event) { - sysNoticeService.noticeForWsWithSessionId(event.getSessionId()); - } - } -} 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 deleted file mode 100644 index 33740931049fce6511c3f2afd22dbcfd081ef097..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupReceiverServiceImpl.java +++ /dev/null @@ -1,26 +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.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 deleted file mode 100644 index b948d97261c93e0233bea04fe2bbbe355681bded..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupServiceImpl.java +++ /dev/null @@ -1,251 +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.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-sys/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 deleted file mode 100644 index 0dd1c270f05b5e49f41704e4c6cc16ad7e563d77..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysOpenDomainServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.lframework.xingyun.template.inner.impl.system; - -import com.baomidou.dynamic.datasource.annotation.DS; -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.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.inner.entity.SysOpenDomain; -import com.lframework.xingyun.template.inner.mappers.system.SysOpenDomainMapper; -import com.lframework.xingyun.template.inner.service.system.SysOpenDomainService; -import com.lframework.xingyun.template.inner.vo.system.open.CreateSysOpenDomainVo; -import com.lframework.xingyun.template.inner.vo.system.open.QuerySysOpenDomainVo; -import com.lframework.xingyun.template.inner.vo.system.open.SysOpenDomainSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.open.UpdateSysOpenDomainSecretVo; -import com.lframework.xingyun.template.inner.vo.system.open.UpdateSysOpenDomainVo; -import java.io.Serializable; -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; - -@DS("master") -@Service -public class SysOpenDomainServiceImpl extends - BaseMpServiceImpl - implements SysOpenDomainService { - - @Override - public PageResult query(QuerySysOpenDomainVo vo) { - PageHelperUtil.startPage(vo); - List datas = getBaseMapper().query(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public PageResult selector(SysOpenDomainSelectorVo vo) { - PageHelperUtil.startPage(vo); - List datas = getBaseMapper().selector(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = SysOpenDomain.CACHE_NAME, key = "#id", unless = "#result == null") - @Override - public SysOpenDomain findById(Integer id) { - return this.getById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysOpenDomainVo vo) { - SysOpenDomain data = new SysOpenDomain(); - data.setName(vo.getName()); - data.setApiSecret(vo.getApiSecret()); - data.setAvailable(Boolean.TRUE); - data.setDescription( - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - if (vo.getTenantId() != null) { - data.setTenantId(vo.getTenantId()); - } - - this.save(data); - - return data.getId(); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysOpenDomainVo vo) { - - SysOpenDomain record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("开放域不存在！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SysOpenDomain.class) - .set(SysOpenDomain::getName, vo.getName()) - .set(SysOpenDomain::getAvailable, vo.getAvailable()) - .set(SysOpenDomain::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .set(SysOpenDomain::getTenantId, vo.getTenantId() == null ? null : vo.getTenantId()) - .eq(SysOpenDomain::getId, vo.getId()); - - this.update(updateWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateApiSecret(UpdateSysOpenDomainSecretVo vo) { - SysOpenDomain record = this.getById(vo.getId()); - if (record == null) { - throw new DefaultClientException("开放域不存在！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SysOpenDomain.class) - .set(SysOpenDomain::getApiSecret, vo.getApiSecret()) - .eq(SysOpenDomain::getId, vo.getId()); - - this.update(updateWrapper); - } - - @CacheEvict(value = SysOpenDomain.CACHE_NAME, key = "#key") - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f4f1af199fa871d2e9517140bffe0841a243d8e3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java +++ /dev/null @@ -1,220 +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.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.exceptions.impl.ParameterNotFoundException; -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.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.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.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.inner.service.system.SysParameterService; -import com.lframework.xingyun.core.utils.OpLogUtil; -import java.io.Serializable; -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 SysParameterServiceImpl extends - BaseMpServiceImpl implements SysParameterService, - SysConfService { - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QuerySysParameterVo 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(QuerySysParameterVo vo) { - - return getBaseMapper().query(vo); - } - - @Cacheable(value = SysParameter.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysParameter findById(Long id) { - - return getBaseMapper().selectById(id); - } - - @Cacheable(value = SysParameter.CACHE_NAME, key = "@cacheVariables.tenantId() + #key", unless = "#result == null") - @Override - public String findByKey(String key) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(SysParameter.class) - .eq(SysParameter::getPmKey, key); - SysParameter data = getBaseMapper().selectOne(queryWrapper); - - return data == null ? null : data.getPmValue(); - } - - @Override - public String findRequiredByKey(String key) throws ParameterNotFoundException { - SysConfService thisService = getThis(this.getClass()); - String data = thisService.findByKey(key); - if (data == null) { - throw new ParameterNotFoundException(); - } - - return data; - } - - @Override - public String findByKey(String key, String defaultValue) { - SysConfService thisService = getThis(this.getClass()); - String data = thisService.findByKey(key); - if (data == null) { - return defaultValue; - } - - return data; - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增系统参数，ID：{}", params = {"#id"}) - @Transactional(rollbackFor = Exception.class) - @Override - public Long create(CreateSysParameterVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysParameter.class) - .eq(SysParameter::getPmKey, vo.getPmKey()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("键重复，请重新输入！"); - } - SysParameter data = new SysParameter(); - data.setPmKey(vo.getPmKey()); - if (!StringUtil.isEmpty(vo.getPmValue())) { - data.setPmValue(vo.getPmValue()); - } - if (!StringUtil.isBlank(vo.getDescription())) { - data.setDescription(vo.getDescription()); - } - - 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(UpdateSysParameterVo vo) { - - SysParameter data = getBaseMapper().selectById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("系统参数不存在！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SysParameter.class) - .set(SysParameter::getPmValue, StringUtil.isBlank(vo.getPmValue()) ? null : vo.getPmValue()) - .set(SysParameter::getDescription, - StringUtil.isBlank(vo.getDescription()) ? null : vo.getDescription()) - .eq(SysParameter::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(Long id) { - - getBaseMapper().deleteById(id); - } - - @Override - public Boolean getBoolean(String key) { - SysConfService thisService = getThis(getClass()); - String value = thisService.findByKey(key); - return value == null ? null : "true".equalsIgnoreCase(value); - } - - @Override - public Boolean getBoolean(String key, Boolean defaultValue) { - Boolean value = getBoolean(key); - if (value == null) { - return defaultValue; - } - - return value; - } - - @Override - public Integer getInteger(String key) { - SysConfService thisService = getThis(getClass()); - String value = thisService.findByKey(key); - try { - return value == null ? null : Integer.valueOf(value); - } catch (NumberFormatException e) { - // 转换失败 - return null; - } - } - - @Override - public Integer getInteger(String key, Integer defaultValue) { - Integer value = getInteger(key); - if (value == null) { - return defaultValue; - } - - return value; - } - - @Override - public Long getLong(String key) { - SysConfService thisService = getThis(getClass()); - String value = thisService.findByKey(key); - try { - return value == null ? null : Long.valueOf(value); - } catch (NumberFormatException e) { - // 转换失败 - return null; - } - } - - @Override - public Long getLong(String key, Long defaultValue) { - Long value = getLong(key); - if (value == null) { - return defaultValue; - } - - return value; - } - - @CacheEvict(value = SysParameter.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/SysRoleMenuServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java deleted file mode 100644 index 4e7df1ac54944ae68a32736755833c17d733ba21..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java +++ /dev/null @@ -1,80 +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.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.components.security.SecurityConstants; -import com.lframework.starter.web.utils.IdUtil; -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; -import com.lframework.xingyun.template.inner.service.system.SysRoleMenuService; -import com.lframework.xingyun.template.inner.service.system.SysRoleService; -import com.lframework.xingyun.template.inner.vo.system.role.SysRoleMenuSettingVo; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysRoleMenuServiceImpl extends - BaseMpServiceImpl implements SysRoleMenuService { - - @Autowired - private SysRoleService sysRoleService; - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "角色授权菜单，角色ID：{}，菜单ID：{}", params = {"#vo.roleIds", - "#vo.menuIds"}, loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void setting(SysRoleMenuSettingVo vo) { - - for (String roleId : vo.getRoleIds()) { - SysRole role = sysRoleService.findById(roleId); - if (ObjectUtil.isNull(role)) { - throw new DefaultClientException("角色不存在！"); - } - - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { - throw new DefaultClientException( - "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME - + "】，不允许授权！"); - } - - this.doSetting(roleId, vo.getMenuIds()); - } - } - - protected void doSetting(String roleId, List menuIds) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery(SysRoleMenu.class) - .eq(SysRoleMenu::getRoleId, roleId); - getBaseMapper().delete(deleteWrapper); - - List records = new ArrayList<>(); - if (!CollectionUtil.isEmpty(menuIds)) { - Set menuIdSet = new HashSet<>(menuIds); - - for (String menuId : menuIdSet) { - SysRoleMenu record = new SysRoleMenu(); - record.setId(IdUtil.getId()); - record.setRoleId(roleId); - record.setMenuId(menuId); - - records.add(record); - } - } - - if (CollectionUtil.isNotEmpty(records)) { - this.saveBatch(records); - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 2eb2d832a8c7d85f84d8537dca0d9642b774c270..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java +++ /dev/null @@ -1,287 +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.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.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.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.List; -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 SysRoleServiceImpl extends BaseMpServiceImpl implements - SysRoleService { - - @Autowired - private SysMenuService sysMenuService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QuerySysRoleVo 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(QuerySysRoleVo vo) { - - return this.doQuery(vo); - } - - @Cacheable(value = SysRole.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysRole findById(String id) { - - return this.doGetById(id); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - SysRoleSelectorVo 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 = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - SysRole role = this.findById(id); - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { - throw new DefaultClientException( - "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME - + "】，不允许停用！"); - } - - this.doUnable(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用角色，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - SysRole role = this.findById(id); - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { - throw new DefaultClientException( - "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME - + "】，不允许启用！"); - } - - this.doEnable(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增角色，ID：{}, 编号：{}", params = {"#id", - "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysRoleVo vo) { - - if (!StringUtil.isBlank(vo.getPermission())) { - - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(vo.getPermission())) { - throw new DefaultClientException( - "权限【" + SecurityConstants.PERMISSION_ADMIN_NAME + "】为内置权限，请修改！"); - } - - // 这里的权限不能与菜单权限重复 - if (sysMenuService.existPermission(vo.getPermission())) { - throw new DefaultClientException( - "权限【" + vo.getPermission() + "】为菜单权限，请修改！"); - } - } - - SysRole 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(UpdateSysRoleVo vo) { - - SysRole data = this.findById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("角色不存在！"); - } - - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(data.getPermission())) { - throw new DefaultClientException("角色【" + data.getName() + "】为内置角色，不允许修改！"); - } - - if (!StringUtil.isBlank(vo.getPermission())) { - - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(vo.getPermission())) { - throw new DefaultClientException( - "权限【" + SecurityConstants.PERMISSION_ADMIN_NAME + "】为内置权限，请修改！"); - } - - // 这里的权限不能与菜单权限重复 - if (sysMenuService.existPermission(vo.getPermission())) { - throw new DefaultClientException( - "权限【" + vo.getPermission() + "】为菜单权限，请修改！"); - } - } - - this.doUpdate(vo); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - @Override - public List getByUserId(String userId) { - - return this.doGetByUserId(userId); - } - - protected List doQuery(QuerySysRoleVo vo) { - - return getBaseMapper().query(vo); - } - - protected SysRole doGetById(String id) { - - return getBaseMapper().findById(id); - } - - protected List doSelector(SysRoleSelectorVo vo) { - - return getBaseMapper().selector(vo); - } - - protected void doUnable(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysRole.class) - .set(SysRole::getAvailable, Boolean.FALSE).eq(SysRole::getId, id); - getBaseMapper().update(updateWrapper); - } - - protected void doEnable(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysRole.class) - .set(SysRole::getAvailable, Boolean.TRUE).eq(SysRole::getId, id); - getBaseMapper().update(updateWrapper); - } - - protected SysRole doCreate(CreateSysRoleVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysRole.class) - .eq(SysRole::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysRole.class) - .eq(SysRole::getName, vo.getName()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysRole data = new SysRole(); - data.setId(IdUtil.getId()); - data.setCode(vo.getCode()); - data.setName(vo.getName()); - - if (!StringUtil.isBlank(vo.getPermission())) { - - data.setPermission(vo.getPermission()); - } - - data.setAvailable(Boolean.TRUE); - data.setDescription( - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - getBaseMapper().insert(data); - - return data; - } - - protected void doUpdate(UpdateSysRoleVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysRole.class) - .eq(SysRole::getCode, vo.getCode()).ne(SysRole::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysRole.class) - .eq(SysRole::getName, vo.getName()) - .ne(SysRole::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SysRole.class) - .set(SysRole::getCode, vo.getCode()).set(SysRole::getName, vo.getName()) - .set(SysRole::getPermission, null) - .set(SysRole::getAvailable, vo.getAvailable()) - .set(SysRole::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .eq(SysRole::getId, vo.getId()); - - if (!StringUtil.isBlank(vo.getPermission())) { - - updateWrapper.set(SysRole::getPermission, vo.getPermission()); - } - - getBaseMapper().update(updateWrapper); - } - - protected List doGetByUserId(String userId) { - - return getBaseMapper().getByUserId(userId); - } - - @CacheEvict(value = SysRole.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/SysSiteMessageServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysSiteMessageServiceImpl.java deleted file mode 100644 index 3a834e8647311dd4a236bbf9896ed0e4fd8f5fa9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysSiteMessageServiceImpl.java +++ /dev/null @@ -1,121 +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.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-sys/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 deleted file mode 100644 index f249d06f966ad29e470dfa56d27bc60aa23cf9f4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java +++ /dev/null @@ -1,83 +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.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; -import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; -import java.io.Serializable; -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 SysUserDeptServiceImpl extends - BaseMpServiceImpl implements SysUserDeptService { - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "用户设置部门，用户ID：{}，部门ID：{}", params = {"#vo.userId", - "#vo.deptIds"}, loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void setting(SysUserDeptSettingVo vo) { - - this.doSetting(vo); - - SysUserDeptService thisService = getThis(this.getClass()); - thisService.cleanCacheByKey(vo.getUserId()); - } - - @Cacheable(value = SysUserDept.CACHE_NAME, key = "@cacheVariables.tenantId() + #userId") - @Override - public List getByUserId(String userId) { - - return doGetByUserId(userId); - } - - @Override - public Boolean hasByDeptId(String deptId) { - - return doHasByDeptId(deptId); - } - - protected void doSetting(SysUserDeptSettingVo vo) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery(SysUserDept.class) - .eq(SysUserDept::getUserId, vo.getUserId()); - getBaseMapper().delete(deleteWrapper); - - if (!CollectionUtil.isEmpty(vo.getDeptIds())) { - for (String deptId : vo.getDeptIds()) { - SysUserDept record = new SysUserDept(); - record.setId(IdUtil.getId()); - record.setUserId(vo.getUserId()); - record.setDeptId(deptId); - - getBaseMapper().insert(record); - } - } - } - - protected List doGetByUserId(String userId) { - - return getBaseMapper().getByUserId(userId); - } - - protected Boolean doHasByDeptId(String deptId) { - - return getBaseMapper().hasByDeptId(deptId) != null; - } - - @CacheEvict(value = SysUserDept.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/SysUserRoleServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java deleted file mode 100644 index 914335c0f4017821455b6efeab95ff701bd784de..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java +++ /dev/null @@ -1,79 +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.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.ObjectUtil; -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.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; -import com.lframework.xingyun.template.inner.vo.system.user.SysUserRoleSettingVo; -import com.lframework.starter.web.utils.IdUtil; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysUserRoleServiceImpl extends - BaseMpServiceImpl - implements SysUserRoleService { - - @Autowired - private SysRoleService sysRoleService; - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "用户授权角色，用户ID：{}，角色ID：{}", params = {"#vo.userIds", - "#vo.roleIds"}, loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void setting(SysUserRoleSettingVo vo) { - - for (String userId : vo.getUserIds()) { - this.doSetting(userId, vo.getRoleIds()); - } - } - - @Override - public List getByUserId(String userId) { - - return doGetByUserId(userId); - } - - protected void doSetting(String userId, List roleIds) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery(SysUserRole.class) - .eq(SysUserRole::getUserId, userId); - getBaseMapper().delete(deleteWrapper); - - if (!CollectionUtil.isEmpty(roleIds)) { - Set roleIdSet = new HashSet<>(roleIds); - - for (String roleId : roleIdSet) { - SysRole role = sysRoleService.findById(roleId); - if (ObjectUtil.isNull(role)) { - throw new DefaultClientException("角色不存在，请检查！"); - } - - SysUserRole record = new SysUserRole(); - record.setId(IdUtil.getId()); - record.setUserId(userId); - record.setRoleId(role.getId()); - - getBaseMapper().insert(record); - } - } - } - - protected List doGetByUserId(String userId) { - - return getBaseMapper().getByUserId(userId); - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c5b9d7bea434bef212caa496a568f82d4158f89e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java +++ /dev/null @@ -1,411 +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.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.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.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.xingyun.template.inner.mappers.system.SysUserMapper; -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.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; -import com.lframework.xingyun.template.inner.vo.system.user.SysUserRoleSettingVo; -import com.lframework.xingyun.template.inner.vo.system.user.SysUserSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.user.UpdateSysUserVo; -import java.io.Serializable; -import java.util.Collections; -import java.util.List; -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.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysUserServiceImpl extends BaseMpServiceImpl implements - SysUserService { - - @Autowired - private PasswordEncoderWrapper encoderWrapper; - - @Autowired - private SysUserDeptService sysUserDeptService; - - @Autowired - private SysUserRoleService sysUserRoleService; - - @Autowired - private GenerateCodeService generateCodeService; - - private static final Integer CODE_KEY = 1; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QuerySysUserVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = this.doQuery(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public List query(QuerySysUserVo vo) { - - return this.doQuery(vo); - } - - @Cacheable(value = SysUser.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysUser findById(String id) { - - return this.doGetById(id); - } - - @Override - public SysUser findByCode(String code) { - Wrapper queryWrapper = Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getCode, code); - return getOne(queryWrapper); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用用户，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void enable(String id) { - - this.doEnable(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用用户，ID：{}", params = "#id") - @Transactional(rollbackFor = Exception.class) - @Override - public void unable(String id) { - - this.doUnable(id); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增用户，ID：{}, 编号：{}", params = {"#id", - "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysUserVo vo) { - - SysUser record = this.doCreate(vo); - - SysUserDeptSettingVo deptSettingVo = new SysUserDeptSettingVo(); - deptSettingVo.setUserId(record.getId()); - deptSettingVo.setDeptIds(vo.getDeptIds()); - sysUserDeptService.setting(deptSettingVo); - - SysUserRoleSettingVo roleSettingVo = new SysUserRoleSettingVo(); - roleSettingVo.setUserIds(Collections.singletonList(record.getId())); - roleSettingVo.setRoleIds(vo.getRoleIds()); - sysUserRoleService.setting(roleSettingVo); - - OpLogUtil.setVariable("id", record.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - - return record.getId(); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "修改用户，ID：{}, 编号：{}", params = {"#id", - "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysUserVo vo) { - - SysUser data = this.findById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("用户不存在！"); - } - - if (!StringUtil.isBlank(vo.getPassword())) { - if (!RegUtil.isMatch(PatternPool.PATTERN_PASSWORD, vo.getPassword())) { - throw new DefaultClientException( - "密码长度必须为5-16位，只允许包含大写字母、小写字母、数字、下划线！"); - } - } - - if (!StringUtil.isBlank(vo.getTelephone())) { - if (!RegUtil.isMatch(PatternPool.PATTERN_CN_TEL, vo.getTelephone())) { - throw new DefaultClientException("联系电话格式不正确！"); - } - } - - this.doUpdate(vo); - - SysUserDeptSettingVo deptSettingVo = new SysUserDeptSettingVo(); - deptSettingVo.setUserId(vo.getId()); - deptSettingVo.setDeptIds(vo.getDeptIds()); - sysUserDeptService.setting(deptSettingVo); - - SysUserRoleSettingVo roleSettingVo = new SysUserRoleSettingVo(); - roleSettingVo.setUserIds(Collections.singletonList(vo.getId())); - roleSettingVo.setRoleIds(vo.getRoleIds()); - sysUserRoleService.setting(roleSettingVo); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - SysUserSelectorVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = this.doSelector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void regist(RegistUserVo vo) { - - this.doRegist(vo); - } - - protected List doQuery(QuerySysUserVo vo) { - - return getBaseMapper().query(vo); - } - - protected SysUser doGetById(String id) { - - return getBaseMapper().findById(id); - } - - protected void doEnable(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysUser.class) - .set(SysUser::getAvailable, Boolean.TRUE).eq(SysUser::getId, id); - getBaseMapper().update(updateWrapper); - } - - protected void doUnable(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysUser.class) - .set(SysUser::getAvailable, Boolean.FALSE).eq(SysUser::getId, id); - getBaseMapper().update(updateWrapper); - } - - protected SysUser doCreate(CreateSysUserVo vo) { - - Wrapper checkCodeWrapper = Wrappers.lambdaQuery(SysUser.class) - .eq(SysUser::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkCodeWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - Wrapper checkUsernameWrapper = Wrappers.lambdaQuery(SysUser.class) - .eq(SysUser::getUsername, vo.getUsername()); - if (getBaseMapper().selectCount(checkUsernameWrapper) > 0) { - throw new DefaultClientException("用户名重复，请重新输入！"); - } - - SysUser record = new SysUser(); - record.setId(IdUtil.getId()); - record.setCode(vo.getCode()); - record.setName(vo.getName()); - record.setUsername(vo.getUsername()); - record.setPassword(encoderWrapper.getEncoder().encode(vo.getPassword())); - if (!StringUtil.isBlank(vo.getEmail())) { - record.setEmail(vo.getEmail()); - } - - if (!StringUtil.isBlank(vo.getTelephone())) { - record.setTelephone(vo.getTelephone()); - } - - record.setGender(EnumUtil.getByCode(Gender.class, vo.getGender())); - record.setAvailable(Boolean.TRUE); - record.setDescription( - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - getBaseMapper().insert(record); - - return record; - } - - protected void doUpdate(UpdateSysUserVo vo) { - - Wrapper checkCodeWrapper = Wrappers.lambdaQuery(SysUser.class) - .eq(SysUser::getCode, vo.getCode()).ne(SysUser::getId, vo.getId()); - if (getBaseMapper().selectCount(checkCodeWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - Wrapper checkUsernameWrapper = Wrappers.lambdaQuery(SysUser.class) - .eq(SysUser::getUsername, vo.getUsername()).ne(SysUser::getId, vo.getId()); - if (getBaseMapper().selectCount(checkUsernameWrapper) > 0) { - throw new DefaultClientException("用户名重复，请重新输入！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(SysUser.class) - .eq(SysUser::getId, vo.getId()).set(SysUser::getCode, vo.getCode()) - .set(SysUser::getUsername, vo.getUsername()) - .set(SysUser::getName, vo.getName()) - .set(SysUser::getEmail, null).set(SysUser::getTelephone, null) - .set(SysUser::getGender, EnumUtil.getByCode(Gender.class, vo.getGender())) - .set(SysUser::getAvailable, vo.getAvailable()).set(SysUser::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - if (!StringUtil.isBlank(vo.getPassword())) { - updateWrapper.set(SysUser::getPassword, - encoderWrapper.getEncoder().encode(vo.getPassword())); - } - - if (!StringUtil.isBlank(vo.getEmail())) { - updateWrapper.set(SysUser::getEmail, vo.getEmail()); - } - - if (!StringUtil.isBlank(vo.getTelephone())) { - updateWrapper.set(SysUser::getTelephone, vo.getTelephone()); - } - - getBaseMapper().update(updateWrapper); - } - - protected List doSelector(SysUserSelectorVo vo) { - - return getBaseMapper().selector(vo); - } - - protected void doRegist(RegistUserVo vo) { - - Wrapper queryWrapper = Wrappers.lambdaQuery(SysUser.class) - .eq(SysUser::getUsername, vo.getUsername()); - if (getBaseMapper().selectCount(queryWrapper) > 0) { - throw new DefaultClientException("用户名重复，请重新输入！"); - } - - SysUser record = new SysUser(); - record.setId(IdUtil.getId()); - record.setCode(generateCodeService.generate(CODE_KEY)); - record.setName(vo.getName()); - record.setUsername(vo.getUsername()); - record.setPassword(encoderWrapper.getEncoder().encode(vo.getPassword())); - if (!StringUtil.isBlank(vo.getEmail())) { - record.setEmail(vo.getEmail()); - } - - if (!StringUtil.isBlank(vo.getTelephone())) { - record.setTelephone(vo.getTelephone()); - } - - record.setGender(Gender.UNKNOWN); - record.setAvailable(Boolean.TRUE); - record.setDescription(StringPool.EMPTY_STR); - - getBaseMapper().insert(record); - } - - @Cacheable(value = UserInfoDto.CACHE_NAME, key = "@cacheVariables.tenantId() + #userId", unless = "#result == null") - @Override - public UserInfoDto getInfo(@NonNull String userId) { - - return this.doGetInfo(userId); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updatePassword(@NonNull String userId, @NonNull String password) { - - this.doUpdatePassword(userId, this.encodePassword(password)); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateEmail(@NonNull String userId, @NonNull String email) { - - this.doUpdateEmail(userId, email); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateTelephone(@NonNull String userId, @NonNull String telephone) { - - this.doUpdateTelephone(userId, telephone); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void lockById(String id) { - - getBaseMapper().lockById(id); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void unlockById(String id) { - - getBaseMapper().unlockById(id); - } - - protected UserInfoDto doGetInfo(@NonNull String userId) { - - return getBaseMapper().getInfo(userId); - } - - protected void doUpdatePassword(@NonNull String userId, @NonNull String password) { - - getBaseMapper().updatePassword(userId, password); - } - - protected void doUpdateEmail(@NonNull String userId, @NonNull String email) { - - getBaseMapper().updateEmail(userId, email); - } - - protected void doUpdateTelephone(@NonNull String userId, @NonNull String telephone) { - - getBaseMapper().updateTelephone(userId, telephone); - } - - protected String encodePassword(String password) { - - return encoderWrapper.getEncoder().encode(password); - } - - @CacheEvict(value = {UserInfoDto.CACHE_NAME, - SysUser.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/SysUserTelephoneServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserTelephoneServiceImpl.java deleted file mode 100644 index 17156efa12c6608fca7eae1834807bdfa4f989d2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserTelephoneServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.lframework.xingyun.template.inner.impl.system; - -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.template.inner.mappers.system.SysUserTelephoneMapper; -import com.lframework.xingyun.template.inner.entity.SysUserTelephone; -import com.lframework.xingyun.template.inner.service.system.SysUserTelephoneService; -import org.springframework.stereotype.Service; - -@Service -public class SysUserTelephoneServiceImpl extends - BaseMpServiceImpl implements - SysUserTelephoneService { - -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysMailMessageListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysMailMessageListener.java deleted file mode 100644 index eb158502c3be6ab01acb74ef10d54f431827368f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysMailMessageListener.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.lframework.xingyun.template.inner.listeners.mq; - -import cn.hutool.extra.mail.MailException; -import com.lframework.starter.common.constants.PatternPool; -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.service.MailService; -import com.lframework.starter.web.utils.ApplicationUtil; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.core.dto.message.SysMailMessageDto; -import com.lframework.xingyun.template.inner.entity.SysUser; -import com.lframework.xingyun.core.queue.MqStringPool; -import com.lframework.xingyun.template.inner.entity.SysMailMessage; -import com.lframework.xingyun.template.inner.enums.system.SysMailMessageSendStatus; -import com.lframework.xingyun.template.inner.service.system.SysMailMessageService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; -import java.util.List; -import java.util.stream.Collectors; -import javax.mail.Address; -import javax.mail.SendFailedException; -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 SysMailMessageListener { - - @Autowired - private SysMailMessageService sysMailMessageService; - - @Autowired - private SysUserService sysUserService; - - @RabbitListener(bindings = { - @QueueBinding(value = @Queue(value = MqStringPool.SYS_MAIL_MESSAGE_QUEUE), key = MqStringPool.SYS_MAIL_MESSAGE_ROUTING_KEY, exchange = @Exchange(value = MqStringPool.SYS_MAIL_MESSAGE_EXCHANGE))}) - public void execute(Message 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 deleted file mode 100644 index db6414dcec721ff0ff9b23524531cec92a2bb9ae..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysNotifyListener.java +++ /dev/null @@ -1,175 +0,0 @@ -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 deleted file mode 100644 index ca4b2d5d13abe91d986034dac68cb956766c1a2d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysSiteMessageListener.java +++ /dev/null @@ -1,92 +0,0 @@ -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-sys/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 deleted file mode 100644 index 020f1c101cad4123f6fb0002a36c0bc89073b344..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/QrtzMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers; - -import com.lframework.xingyun.template.inner.dto.qrtz.QrtzDto; -import com.lframework.xingyun.template.inner.vo.qrtz.QueryQrtzVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - * @author zmj - * @since 2022/8/20 - */ -public interface QrtzMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QueryQrtzVo vo); - - /** - * 根据ID查询 - * - * @param name - * @param group - * @return - */ - QrtzDto findById(@Param("name") String name, @Param("group") String group); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9262e57ba29d36b2501fdc6ca53ade61c58b66e7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers; - -import com.lframework.xingyun.template.inner.entity.SysModule; -import com.lframework.starter.web.mapper.BaseMapper; - -public interface SysModuleMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5a19efec165c3d4492542faa3f2ac5f9ceb496bf..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleTenantMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers; - -import com.lframework.xingyun.template.inner.entity.SysModuleTenant; -import com.lframework.starter.web.mapper.BaseMapper; - -public interface SysModuleTenantMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 11cd5b24f5bc343946b8d1c76df151713313e2f7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers; - -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; -import com.lframework.xingyun.template.inner.vo.system.tenant.TenantSelectorVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface TenantMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - @Sorts({ - @Sort(value = "id", alias = "tb", autoParse = true), - @Sort(value = "name", alias = "tb", autoParse = true), - }) - List query(@Param("vo") QueryTenantVo vo); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") TenantSelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e1b63a82fb17aeda0f37571fe1c35a2a9125fab5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.starter.web.components.security.DefaultUserDetails; - -/** - * 用于登录的用户信息查询Mapper - * - * @author zmj - */ -public interface UserDetailsMapper extends BaseMapper { - - /** - * 根据登录名查询 - * - * @param username - * @return - */ - DefaultUserDetails findByUsername(String username); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4bcba41108e93294e60991d8efc4e08994922c89..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicCategoryMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.inner.vo.system.dic.category.SysDataDicCategorySelectorVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据字典分类 Mapper 接口 - *

- * - * @author zmj - */ -public interface SysDataDicCategoryMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - List query(); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") SysDataDicCategorySelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 540e251362c97743412131daf1c7e32751c819e0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据字典值 Mapper 接口 - *

- * - * @author zmj - */ -public interface SysDataDicItemMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - @Sorts({ - @Sort(value = "code", alias = "tb", autoParse = true), - @Sort(value = "name", alias = "tb", autoParse = true), - }) - List query(@Param("vo") QuerySysDataDicItemVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a17c1c26a516b7882e839a0f3c765684c5ea760e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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; -import com.lframework.xingyun.template.inner.vo.system.dic.SysDataDicSelectorVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 数据字典 Mapper 接口 - *

- * - * @author zmj - */ -public interface SysDataDicMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - @Sorts({ - @Sort(value = "code", alias = "tb", autoParse = true), - @Sort(value = "name", alias = "tb", autoParse = true), - }) - List query(@Param("vo") QuerySysDataDicVo vo); - - /** - * 选择器 - * - * @return - */ - List selector(@Param("vo") SysDataDicSelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f95be5214908c859f637bc7fdaa5be9db2806670..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; -import com.lframework.starter.web.mapper.BaseMapper; - -public interface SysDataPermissionDataMapper extends - BaseMapper { - -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionModelDetailMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionModelDetailMapper.java deleted file mode 100644 index d8c7b01daf2c86a238abd8619cef5f400d3ed41e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionModelDetailMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.inner.entity.SysDataPermissionModelDetail; - -public interface SysDataPermissionModelDetailMapper extends - BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a1648b4777e7a4db9cc76936019a79aaec8d98e2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDeptMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; - -/** - *

- * 部门 Mapper 接口 - *

- * - * @author zmj - * @since 2021-06-26 - */ -public interface SysDeptMapper extends BaseMapper { - - /** - * 选择器 - * - * @return - */ - List selector(); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysDept findById(String id); -} 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 deleted file mode 100644 index a918b54aa6631f4159ca33a13cbd9bc3b8624c16..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysGenerateCodeMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -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-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMailMessageMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMailMessageMapper.java deleted file mode 100644 index 2466b5262f9c7de9088eb5ac8b63a1c808efcbd0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMailMessageMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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 接口 - *

- * - * @author zmj - */ -public interface SysMailMessageMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QuerySysMailMessageVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 522e09eb385608417faa84aa1229ac10512183e9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMenuMapper.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.dto.MenuDto; -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.inner.vo.system.menu.SysMenuSelectorVo; -import java.util.List; -import java.util.Set; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 系统菜单 Mapper 接口 - *

- * - * @author zmj - * @since 2021-05-10 - */ -public interface SysMenuMapper extends BaseMapper { - - /** - * 系统菜单列表 - * - * @return - */ - List query(@Param("moduleIds") List moduleIds); - - /** - * 根据角色ID查询已授权的菜单 - * - * @param roleId - * @return - */ - List getByRoleId(@Param("roleId") String roleId, - @Param("moduleIds") List moduleIds); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysMenu findById(String id); - - /** - * 系统菜单选择器数据 - * - * @return - */ - List selector(@Param("vo") SysMenuSelectorVo vo, @Param("moduleIds") List moduleIds); - - /** - * 根据ID查询子节点 - * - * @param id - * @return - */ - List getChildrenById(String id); - - /** - * 根据用户ID查询菜单 - * - * @param userId - * @param isAdmin 是否为管理员 - * @return - */ - List getMenuByUserId(@Param("userId") String userId, @Param("isAdmin") boolean isAdmin, - @Param("moduleIds") List moduleIds); - - /** - * 根据用户ID查询收藏的菜单 - * - * @param userId - * @return - */ - List getCollectMenuIds(@Param("userId") String userId); - - /** - * 根据用户ID查询权限 - * - * @param userId - * @return - */ - Set getPermissionsByUserId(@Param("userId") String userId, - @Param("isAdmin") boolean isAdmin, - @Param("moduleIds") List moduleIds); - - /** - * 根据用户ID查询角色权限 - * - * @param userId - * @return - */ - Set getRolePermissionByUserId(@Param("userId") String userId); - - /** - * 收藏菜单 - * - * @param id - * @param userId - * @param menuId - */ - void collectMenu(@Param("id") String id, @Param("userId") String userId, - @Param("menuId") String menuId); - - /** - * 取消收藏菜单 - * - * @param userId - * @param menuId - */ - void cancelCollectMenu(@Param("userId") String userId, @Param("menuId") String menuId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5c3ac7aafa14a84abae30035d43cd37f497f196e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeLogMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysNoticeLog; -import com.lframework.starter.web.mapper.BaseMapper; - -/** - *

- * 系统通知记录 Mapper 接口 - *

- * - * @author zmj - */ -public interface SysNoticeLogMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ea30410fb8f69ee663015b84ca5a655a4fc2e198..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeMapper.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysNotice; -import com.lframework.xingyun.template.inner.dto.system.notice.QuerySysNoticeByUserDto; -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeByUserVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 系统通知 Mapper 接口 - *

- * - * @author zmj - */ -public interface SysNoticeMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(@Param("vo") QuerySysNoticeVo vo); - - /** - * 设置已读 - * - * @param id - */ - void setReaded(String id); - - /** - * 根据用户查询 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - List queryByUser(@Param("vo") QuerySysNoticeByUserVo vo); -} 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 deleted file mode 100644 index ab24d30cea9c14e12e7764822787215c06802fb4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 14013bca9ad7d73f5f3309ffd501c48271ee5d95..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupReceiverMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -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-sys/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 deleted file mode 100644 index 1dcf7dffff577873e10ddf2e229a41cbbd4c55ef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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; -import com.lframework.xingyun.template.inner.vo.system.open.SysOpenDomainSelectorVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-02 - */ -public interface SysOpenDomainMapper extends BaseMapper { - - /** - * 查询列表 - * - * @return - */ - @Sorts({ - @Sort(value = "id", autoParse = true), - @Sort(value = "name", autoParse = true), - @Sort(value = "tenantId", autoParse = true), - }) - List query(@Param("vo") QuerySysOpenDomainVo vo); - - /** - * 选择器 - * - * @return - */ - List selector(@Param("vo") SysOpenDomainSelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a6649894970d075bb3a0f63b773ec0c8ced1287f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 系统参数 Mapper 接口 - *

- * - * @author zmj - */ -public interface SysParameterMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - @Sorts({ - @Sort(value = "pmKey", alias = "tb", autoParse = true), - @Sort(value = "createTime", alias = "tb", autoParse = true), - }) - List query(@Param("vo") QuerySysParameterVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6325cbe4030b5c23caeba9c78c5eaec3f608de0e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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; -import com.lframework.xingyun.template.inner.vo.system.role.SysRoleSelectorVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-02 - */ -public interface SysRoleMapper 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") QuerySysRoleVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysRole findById(String id); - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") SysRoleSelectorVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index e2311c7adb1f679bb4175b3981c366bf110295b9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMenuMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysRoleMenu; -import com.lframework.starter.web.mapper.BaseMapper; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-04 - */ -public interface SysRoleMenuMapper extends BaseMapper { - -} 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 deleted file mode 100644 index c337422b07fb3d33162bca63f9473ac4593f1b44..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysSiteMessageMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -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-sys/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 deleted file mode 100644 index cbe00813f32cc52dea9e198ea5e1be47b8f7c309..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserDeptMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysUserDept; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-04 - */ -public interface SysUserDeptMapper extends BaseMapper { - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); - - /** - * 根据部门ID查询是否存在 - * - * @param deptId - * @return - */ - SysUserDept hasByDeptId(String deptId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 68eddc7799dcacdc56de382d9336d22e7f941349..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -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.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; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-04 - */ -public interface SysUserMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - @Sorts({ - @Sort(value = "code", alias = "u", autoParse = true), - @Sort(value = "username", alias = "u", autoParse = true), - @Sort(value = "name", alias = "u", autoParse = true), - @Sort(value = "createTime", alias = "u", autoParse = true), - @Sort(value = "updateTime", alias = "u", autoParse = true), - }) - List query(@Param("vo") QuerySysUserVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysUser findById(String id); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") SysUserSelectorVo vo); - - /** - * 获取用户信息 - * - * @param userId 用户ID - * @return - */ - UserInfoDto getInfo(String userId); - - /** - * 修改用户密码 - * - * @param userId 用户ID - * @param password 新密码（密文） - */ - void updatePassword(@Param("userId") String userId, @Param("password") String password); - - /** - * 修改邮箱 - * - * @param userId 用户ID - * @param email 邮箱 - */ - void updateEmail(@Param("userId") String userId, @Param("email") String email); - - /** - * 修改联系电话 - * - * @param userId 用户ID - * @param telephone 联系电话 - */ - void updateTelephone(@Param("userId") String userId, @Param("telephone") String telephone); - - /** - * 根据ID锁定 - * - * @param id - */ - void lockById(String id); - - /** - * 根据ID解锁 - * - * @param id - */ - void unlockById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c4fafa7bd2984eb41471fdc8f6cb6604d7b4c846..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserRoleMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysUserRole; -import com.lframework.starter.web.mapper.BaseMapper; -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author zmj - * @since 2021-07-04 - */ -public interface SysUserRoleMapper extends BaseMapper { - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 95144fd0b5edef50c5d9c4c6a316f1aecf794941..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserTelephoneMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.inner.entity.SysUserTelephone; -import com.lframework.starter.web.mapper.BaseMapper; - -public interface SysUserTelephoneMapper extends BaseMapper { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4c015e665f840bed443bc3a55ebc14058fe940db..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/QrtzService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.lframework.xingyun.template.inner.service; - -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.vo.qrtz.CreateQrtzVo; -import com.lframework.xingyun.template.inner.vo.qrtz.UpdateQrtzVo; -import com.lframework.xingyun.template.inner.vo.qrtz.QueryQrtzVo; -import com.lframework.starter.web.service.BaseService; -import com.lframework.xingyun.template.inner.dto.qrtz.QrtzDto; - -/** - * @author zmj - * @since 2022/8/20 - */ -public interface QrtzService extends BaseService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QueryQrtzVo vo); - - /** - * 根据ID查询 - * - * @param name - * @param group - * @return - */ - QrtzDto findById(String name, String group); - - /** - * 创建 - * - * @param vo - */ - void create(CreateQrtzVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateQrtzVo vo); - - /** - * 恢复 - * - * @param name - * @param group - */ - void resume(String name, String group); - - /** - * 暂停 - * - * @param name - * @param group - */ - void pause(String name, String group); - - /** - * 触发 - * - * @param name - * @param group - */ - void trigger(String name, String group); - - /** - * 删除 - * - * @param name - * @param group - */ - void delete(String name, String group); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d5a006fb12b2f9ed3abf440b02945d0e64de6ce3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.lframework.xingyun.template.inner.service; - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.entity.SysModule; - -public interface SysModuleService extends BaseMpService { -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 42c4378d166d987924c4c51fbe01b0ef47353a49..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleTenantService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.inner.service; - -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.entity.SysModuleTenant; -import com.lframework.xingyun.template.inner.vo.system.module.SysModuleTenantVo; -import java.util.List; - -public interface SysModuleTenantService extends BaseMpService { - - /** - * 根据租户ID查询可用模块ID - * - * @param tenantId - * @return - */ - List getAvailableModuleIdsByTenantId(Integer tenantId); - - /** - * 根据租户ID查询 - * @param tenantId - * @return - */ - List getByTenantId(Integer tenantId); - - /** - * 设置模块 - * @param vo - */ - void setting(SysModuleTenantVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 75f73ae8d33e1ab2ad3f4f1b92a22a635740c087..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/TenantService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.lframework.xingyun.template.inner.service; - -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.entity.Tenant; -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; - -/** - * 租户Service - * - * @author zmj - */ -public interface TenantService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QueryTenantVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, TenantSelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - Tenant findById(Integer id); - - /** - * 新增 - * - * @param data - * @return - */ - Integer create(CreateTenantVo data); - - /** - * 修改 - * - * @param data - */ - void update(UpdateTenantVo data); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9cccf9f8133c37be195680dc67fb612a2afb8435..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicCategoryService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.dic.category.CreateSysDataDicCategoryVo; -import com.lframework.xingyun.template.inner.vo.system.dic.category.SysDataDicCategorySelectorVo; -import com.lframework.xingyun.template.inner.vo.system.dic.category.UpdateSysDataDicCategoryVo; -import java.util.List; - -/** - * 数据字典分类 Service - * - * @author zmj - */ -public interface SysDataDicCategoryService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - List queryList(); - - /** - * 选择器 - * - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - SysDataDicCategorySelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysDataDicCategory findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysDataDicCategoryVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysDataDicCategoryVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0a1ef70d607ad0dc036e164275c83cb3040d9802..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicItemService.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysDataDicItem; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.dic.item.CreateSysDataDicItemVo; -import com.lframework.xingyun.template.inner.vo.system.dic.item.QuerySysDataDicItemVo; -import com.lframework.xingyun.template.inner.vo.system.dic.item.UpdateSysDataDicItemVo; -import java.util.List; - -/** - * 数据字典值 Service - * - * @author zmj - */ -public interface SysDataDicItemService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QuerySysDataDicItemVo vo); - - /** - * 查询列表 - * - * @return - */ - List query(QuerySysDataDicItemVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysDataDicItem findById(String id); - - /** - * 根据字典Code、字典值Code查询 - * - * @param dicCode - * @param code - * @return - */ - SysDataDicItem findByCode(String dicCode, String code); - - /** - * 根据字典编号查询 - * - * @param dicCode - * @return - */ - List findByDicCode(String dicCode); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysDataDicItemVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysDataDicItemVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 441d59e6a1dedceb3da77ccd3ad1fabeb854655b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysDataDic; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.dic.CreateSysDataDicVo; -import com.lframework.xingyun.template.inner.vo.system.dic.QuerySysDataDicVo; -import com.lframework.xingyun.template.inner.vo.system.dic.SysDataDicSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.dic.UpdateSysDataDicVo; -import java.util.List; - -/** - * 数据字典 Service - * - * @author zmj - */ -public interface SysDataDicService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QuerySysDataDicVo vo); - - /** - * 查询列表 - * - * @return - */ - List query(QuerySysDataDicVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, SysDataDicSelectorVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysDataDic findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysDataDicVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysDataDicVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 62631ad0609257b9dc8bb64df9b67ea62b3b8f51..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; -import com.lframework.starter.web.service.BaseMpService; -import java.util.List; - -public interface SysDataPermissionDataService extends - BaseMpService { - - /** - * 根据业务ID查询 - * - * @param bizId - * @return - */ - List getByBizId(String bizId); - - /** - * 根据业务ID查询 - * - * @param bizId - * @param bizType - * @return - */ - SysDataPermissionData getByBizId(String bizId, Integer bizType, Integer permissionType); -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionModelDetailService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionModelDetailService.java deleted file mode 100644 index 02d83613deeddb2aaa5a534218445e4f64a5f034..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionModelDetailService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.starter.web.service.BaseMpService; -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; - -public interface SysDataPermissionModelDetailService extends - BaseMpService { - - /** - * 解析SQL - * - * @param models - * @return - */ - String toSql(List models); - - /** - * 格式化SQL - * - * @param sqlTemplate - * @param params 表别名Map Key：表名占位符，具体定义数据表中的table_name Value：具体SQL的别名 - * @return - */ - String formatSql(String sqlTemplate, Map params); - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8c0edcd2c789ad369bca2eeca1a139444d9c9547..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -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; -import java.util.List; - -public interface SysDeptService extends BaseMpService { - - /** - * 选择器 - * - * @return - */ - List selector(); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysDept findById(String id); - - /** - * 根据编号查询 - * - * @param code - * @return - */ - SysDept findByCode(String code); - - /** - * 根据ID停用 - * - * @param id - */ - void unable(String id); - - /** - * 根据ID启用 - * - * @param id - */ - void enable(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysDeptVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysDeptVo vo); -} 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 deleted file mode 100644 index 1037348db333492aaa2482c7d6b36f2b35f2b098..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysGenerateCodeService.java +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index 116ca471448db687a68a7edb3f9db887f94af30a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMailMessageService.java +++ /dev/null @@ -1,36 +0,0 @@ -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-sys/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 deleted file mode 100644 index 5cc65946b081637711c3216f0f7d28f1e44bc3e1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.dto.MenuDto; -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.starter.web.service.BaseMpService; -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 java.util.List; -import java.util.Set; - -/** - *

- * 系统菜单 服务类 - *

- * - * @author zmj - * @since 2021-05-10 - */ -public interface SysMenuService extends BaseMpService { - - /** - * 系统菜单列表 - * - * @return - */ - List queryList(List moduleIds); - - /** - * 根据角色ID查询已授权的菜单 - * - * @param roleId - * @return - */ - List getByRoleId(String roleId, List moduleIds); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysMenu findById(String id); - - /** - * 创建系统菜单 - * - * @param vo - */ - String create(CreateSysMenuVo vo); - - /** - * 修改系统菜单 - * - * @param vo - */ - void update(UpdateSysMenuVo vo); - - /** - * 根据ID删除 - * - * @param id - */ - void deleteById(String id); - - /** - * 系统菜单选择器数据 - * - * @return - */ - List selector(SysMenuSelectorVo vo, List moduleIds); - - /** - * 批量启用 - * - * @param id - */ - void enable(String id); - - /** - * 停用 - * - * @param id - */ - void unable(String id); - - /** - * 是否存在权限 - * - * @param permission - * @return - */ - Boolean existPermission(String permission); - - /** - * 根据用户ID查询菜单 - * - * @param userId - * @param isAdmin 是否为管理员 - * @return - */ - List getMenuByUserId(String userId, boolean isAdmin, List moduleIds); - - /** - * 根据用户ID查询权限 - * - * @param userId - * @return - */ - Set getPermissionsByUserId(String userId, boolean isAdmin, List moduleIds); - - /** - * 根据用户ID查询角色权限 - * @param userId - * @return - */ - Set getRolePermissionByUserId(String userId); - - /** - * 收藏菜单 - * - * @param userId - * @param menuId - */ - void collect(String userId, String menuId); - - /** - * 取消收藏菜单 - * - * @param userId - * @param menuId - */ - void cancelCollect(String userId, String menuId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index acd1d5a9e7fa7a36bb32dcc20b5d820125883cd4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeLogService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysNoticeLog; -import com.lframework.starter.web.service.BaseMpService; - -/** - * 系统通知记录 Service - * - * @author zmj - */ -public interface SysNoticeLogService extends BaseMpService { - - /** - * 设置已读 - * - * @param noticeId - * @param userId - */ - boolean setReaded(String noticeId, String userId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 550d752feb9bf652303f641eb18cde0a2819fb53..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeService.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -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; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.notice.CreateSysNoticeVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeByUserVo; -import com.lframework.xingyun.template.inner.vo.system.notice.QuerySysNoticeVo; -import com.lframework.xingyun.template.inner.vo.system.notice.UpdateSysNoticeVo; -import java.util.List; - -/** - * 系统通知 Service - * - * @author zmj - */ -public interface SysNoticeService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QuerySysNoticeVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QuerySysNoticeVo vo); - - /** - * 根据用户查询 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult queryByUser(Integer pageIndex, Integer pageSize, - QuerySysNoticeByUserVo vo); - - /** - * 根据ID查询内容 - * - * @param id - * @return - */ - SysNoticeDto getContent(String id); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysNotice findById(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysNoticeVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysNoticeVo vo); - - /** - * 发布 - * - * @param id - */ - void publish(String id); - - /** - * 设置已读 - * - * @param id - * @param userId - */ - void setReaded(String id, String userId); - - /** - * 发送通知 - */ - void noticeForWs(); - - /** - * 发送通知 - */ - void noticeForWs(String userId); - - /** - * 发送通知 - */ - void noticeForWsWithSessionId(String sessionId); - -} 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 deleted file mode 100644 index d9bfaaf192c2d8199e31931e177c43a4f975d3a4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupReceiverService.java +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index ce8f01cd456c9e5a78ff8c9ff4bd00c71265c2ba..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupService.java +++ /dev/null @@ -1,72 +0,0 @@ -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-sys/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 deleted file mode 100644 index 7843c42591fd0124de658e251cfef184b0c3a478..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysOpenDomainService.java +++ /dev/null @@ -1,58 +0,0 @@ -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.SysOpenDomain; -import com.lframework.xingyun.template.inner.vo.system.open.QuerySysOpenDomainVo; -import com.lframework.xingyun.template.inner.vo.system.open.CreateSysOpenDomainVo; -import com.lframework.xingyun.template.inner.vo.system.open.SysOpenDomainSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.open.UpdateSysOpenDomainSecretVo; -import com.lframework.xingyun.template.inner.vo.system.open.UpdateSysOpenDomainVo; - -public interface SysOpenDomainService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - PageResult query(QuerySysOpenDomainVo vo); - - /** - * 选择器 - * - * @return - */ - PageResult selector(SysOpenDomainSelectorVo vo); - - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysOpenDomain findById(Integer id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysOpenDomainVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysOpenDomainVo vo); - - /** - * 修改Api密钥 - * - * @param vo - */ - void updateApiSecret(UpdateSysOpenDomainSecretVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ae2b2392cc38dbb64c14903498a6e4474310c745..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysParameterService.java +++ /dev/null @@ -1,63 +0,0 @@ -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.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 java.util.List; - -/** - * 系统参数 Service - * - * @author zmj - */ -public interface SysParameterService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QuerySysParameterVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QuerySysParameterVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysParameter findById(Long id); - - /** - * 创建 - * - * @param vo - * @return - */ - Long create(CreateSysParameterVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysParameterVo vo); - - /** - * 根据ID删除 - * - * @param id - * @return - */ - void deleteById(Long id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8b3d1042d68b68e0877f0ba6c341416d4f438cb1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleMenuService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysRoleMenu; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.role.SysRoleMenuSettingVo; - -public interface SysRoleMenuService extends BaseMpService { - - /** - * 授权角色菜单 - * - * @param vo - */ - void setting(SysRoleMenuSettingVo vo); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 44fda83667b415fe1653bacb24077637d148bd6a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -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.List; - -public interface SysRoleService extends BaseMpService { - - /** - * 查询列表 - * - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QuerySysRoleVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QuerySysRoleVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysRole findById(String id); - - /** - * 选择器 - * - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, SysRoleSelectorVo vo); - - /** - * 根据ID停用 - * - * @param id - */ - void unable(String id); - - /** - * 根据ID启用 - * - * @param id - */ - void enable(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysRoleVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysRoleVo vo); - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); -} 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 deleted file mode 100644 index 348941a9ebf6e0643e77cf2f91b883c30405850f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysSiteMessageService.java +++ /dev/null @@ -1,76 +0,0 @@ -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-sys/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 deleted file mode 100644 index da1ad3234c0067510ff15af7772552807e0018cb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserDeptService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysUserDept; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.dept.SysUserDeptSettingVo; -import java.util.List; - -public interface SysUserDeptService extends BaseMpService { - - /** - * 设置部门 - * - * @param vo - */ - void setting(SysUserDeptSettingVo vo); - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); - - /** - * 根据部门ID查询是否存在 - * - * @param deptId - * @return - */ - Boolean hasByDeptId(String deptId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c40e19a507b7f6e93524dfd1c38b93e648be6964..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserRoleService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysUserRole; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.user.SysUserRoleSettingVo; -import java.util.List; - -public interface SysUserRoleService extends BaseMpService { - - /** - * 用户授权 - * - * @param vo - */ - void setting(SysUserRoleSettingVo vo); - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 05eb9ff8f93286919afa88bc187a1d9ebd42246d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java +++ /dev/null @@ -1,141 +0,0 @@ -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.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; -import com.lframework.xingyun.template.inner.vo.system.user.SysUserSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.user.UpdateSysUserVo; -import java.util.List; - -public interface SysUserService extends BaseMpService { - - /** - * 查询列表 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, QuerySysUserVo vo); - - /** - * 查询列表 - * - * @param vo - * @return - */ - List query(QuerySysUserVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysUser findById(String id); - - /** - * 根据编号查询 - * - * @param code - * @return - */ - SysUser findByCode(String code); - - /** - * 启用 - * - * @param id - */ - void enable(String id); - - /** - * 停用 - * - * @param id - */ - void unable(String id); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysUserVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysUserVo vo); - - /** - * 选择器 - * - * @param pageIndex - * @param pageSize - * @param vo - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, SysUserSelectorVo vo); - - /** - * 注册 - * - * @param vo - */ - void regist(RegistUserVo vo); - - /** - * 获取用户信息 - * - * @param userId 用户ID - * @return - */ - UserInfoDto getInfo(String userId); - - /** - * 修改用户密码 - * - * @param userId 用户ID - * @param password 新密码（明文） - */ - void updatePassword(String userId, String password); - - /** - * 修改邮箱 - * - * @param userId 用户ID - * @param email 邮箱 - */ - void updateEmail(String userId, String email); - - /** - * 修改联系电话 - * - * @param userId 用户ID - * @param telephone 联系电话 - */ - void updateTelephone(String userId, String telephone); - - /** - * 根据ID锁定 - * - * @param id - */ - void lockById(String id); - - /** - * 根据ID解锁 - * - * @param id - */ - void unlockById(String id); -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a07657d1d49c4c2f891dbddbd949b63d7fae137f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserTelephoneService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysUserTelephone; -import com.lframework.starter.web.service.BaseMpService; - -public interface SysUserTelephoneService extends BaseMpService { - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 42f9311e1b2b2be399dcd82b735ef74253e2adbf..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.lframework.xingyun.template.inner.sign.handler; - -import com.lframework.starter.common.exceptions.impl.DefaultSysException; -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.components.tenant.TenantContextHolder; -import com.lframework.starter.web.sign.CheckSignHandler; -import com.lframework.starter.web.utils.TenantUtil; -import com.lframework.starter.web.vo.OpenApiReqVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class DefaultCheckSignHandler implements CheckSignHandler { - - @Autowired - private SysOpenDomainService sysOpenDomainService; - - @Override - public boolean check(OpenApiReqVo req) { - Integer clientId = req.getClientId(); - if (clientId == null) { - return false; - } - - String timestamp = req.getTimestamp(); - if (StringUtil.isBlank(timestamp)) { - return false; - } - - String nonceStr = req.getNonceStr(); - if (StringUtil.isBlank(nonceStr)) { - return false; - } - - String params = req.getParams(); - if (StringUtil.isBlank(params)) { - return false; - } - - String sign = req.getSign(); - if (StringUtil.isBlank(params)) { - return false; - } - - SysOpenDomain domain = sysOpenDomainService.findById(clientId); - if (domain == null || !domain.getAvailable()) { - return false; - } - - return SignUtil - .validate(clientId.toString(), domain.getApiSecret(), timestamp, nonceStr, params, sign); - } - - @Override - public void setTenantId(OpenApiReqVo req) { - if (TenantUtil.enableTenant()) { - SysOpenDomain domain = sysOpenDomainService.findById(req.getClientId()); - Integer tenantId = domain.getTenantId(); - if (tenantId == null) { - throw new DefaultSysException("开放域没有设置租户ID"); - } else { - TenantContextHolder.setTenantId(domain.getTenantId()); - } - } - } -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 88ad064cab5a61f3f63850f6429cf2be065d4d56..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/util/SignUtil.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.lframework.xingyun.template.inner.sign.util; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Api加签、验签工具类 - */ -public class SignUtil { - - private static final Logger log = LoggerFactory.getLogger(SignUtil.class); - - /** - * 加签 - * - * @param clientId 客户端ID - * @param apiSecret Api密钥 - * @param timestamp 时间戳 - * @param nonceStr 随机字符串 - * @param json 请求参数 - * @return - */ - public static String sign(String clientId, String apiSecret, String timestamp, String nonceStr, - String json) { - String str = new StringBuilder().append("clientId=").append(clientId).append("&") - .append("apiSecret=").append(apiSecret) - .append("&").append("timestamp=").append(timestamp).append("&").append("nonceStr=") - .append(nonceStr).append("&").append("params=") - .append(json).toString(); - MessageDigest digest = null; - try { - digest = MessageDigest.getInstance("MD5"); - } catch (NoSuchAlgorithmException e) { - log.error(e.getMessage(), e); - throw new RuntimeException(e); - } - byte[] bs = digest.digest(str.getBytes(StandardCharsets.UTF_8)); - StringBuilder builder = new StringBuilder(); - for (byte b : bs) { - int x = b & 255; - String s = Integer.toHexString(x); - if (x > 0 && x < 16) { - builder.append("0"); - builder.append(s); - } else { - builder.append(s); - } - } - - return builder.toString(); - } - - /** - * 验签 - * - * @param clientId 客户端ID - * @param apiSecret Api密钥 - * @param timestamp 时间戳 - * @param nonceStr 随机字符串 - * @param json 请求参数 - * @param oriSign 原始签值 - * @return - */ - public static boolean validate(String clientId, String apiSecret, String timestamp, - String nonceStr, String json, - String oriSign) { - return sign(clientId, apiSecret, timestamp, nonceStr, json).equals(oriSign); - } - - // 以下为示例 - /* - public static void main(String[] args) { - String clientId = ""; - String apiSecret = ""; - String ts = String.valueOf(System.currentTimeMillis()); - - //此处为示例的获取字符串算法，此处可以自行替换算法 - String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - Random random = new Random(); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < 20; i++) { - int number = random.nextInt(62); - builder.append(str.charAt(number)); - } - - String nonceStr = builder.toString(); - - String json = "{\"key1\":\"value1\", \"key2\":\"value2\"}"; - String sign = SignUtil.sign(clientId, apiSecret, ts, nonceStr, json); // 这里是加签 - - boolean isValidate = SignUtil.validate(clientId, apiSecret, ts, nonceStr, json, sign); // 这里是验签 - } - */ -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 44b6c15c1216be0a31d652c7b97f5348d31c93b1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/CreateQrtzVo.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.qrtz; - -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.xingyun.template.inner.enums.QrtzJobType; -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; - -/** - * @author zmj - * @since 2022/8/20 - */ -@Data -public class CreateQrtzVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 分组 - */ - @ApiModelProperty(value = "分组", required = true) - @NotBlank(message = "分组不能为空！") - private String group; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private Integer tenantId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 执行类名 - */ - @ApiModelProperty("执行类名") - private String targetClassName; - - /** - * 执行方法名 - */ - @ApiModelProperty("执行方法名") - private String targetMethodName; - - /** - * 执行参数类型 - */ - @ApiModelProperty("执行参数类型") - private List targetParamTypes; - - /** - * 执行参数 - */ - @ApiModelProperty("执行参数") - private List targetParams; - - /** - * Cron表达式 - */ - @ApiModelProperty("Cron表达式") - @NotBlank(message = "Cron表达式不能为空！") - private String cron; - - /** - * 任务类型 - */ - @NotNull(message = "任务类型不能为空！") - @IsEnum(message = "任务类型不能为空！", enumClass = QrtzJobType.class) - private Integer jobType; - - /** - * 脚本 - */ - @ApiModelProperty("脚本") - private String script; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7f6370209170b89dce2dc4a80a8aa8faaa5dc920..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/QueryQrtzVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.qrtz; - -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.PageVo; -import com.lframework.xingyun.template.inner.enums.TriggerState; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import lombok.Data; - -/** - * @author zmj - * @since 2022/8/20 - */ -@Data -public class QueryQrtzVo extends PageVo { - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 组 - */ - @ApiModelProperty("组") - private String group; - - /** - * 状态 - */ - @ApiModelProperty("状态") - @IsEnum(message = "状态格式错误！", enumClass = TriggerState.class) - private String state; - - /** - * 任务类 - */ - @ApiModelProperty(hidden = true) - private List jobClasses; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 26846be760f8d85fbbdeefb53409198bc661f3aa..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/UpdateQrtzVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.qrtz; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import lombok.Data; - -/** - * @author zmj - * @since 2022/8/20 - */ -@Data -public class UpdateQrtzVo extends CreateQrtzVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 原始任务名称 - */ - @ApiModelProperty(value = "原始任务名称", required = true) - @NotBlank(message = "原始任务名称不能为空！") - private String oriName; - - /** - * 原始任务分组 - */ - @ApiModelProperty(value = "原始任务分组", required = true) - @NotBlank(message = "原始任务分组不能为空！") - private String oriGroup; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a66c08786261db696610f7c88b8396a26acdc412..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/config/UpdateSysConfigVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.config; - -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysConfigVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 是否允许注册 - */ - @ApiModelProperty(value = "是否允许注册", required = true) - @NotNull(message = "请选择是否允许注册！") - @TypeMismatch(message = "是否允许注册格式错误！") - private Boolean allowRegist; - - /** - * 是否允许手机号登录 - */ - @ApiModelProperty(value = "是否允许手机号登录", required = true) - @NotNull(message = "请选择是否允许手机号登录！") - @TypeMismatch(message = "是否允许手机号登录格式错误！") - private Boolean allowTelephoneLogin; - - /** - * 手机号登录时的signName - */ - private String telephoneLoginSignName; - - /** - * 手机号登录时的templateCode - */ - private String telephoneLoginTemplateCode; - - /** - * 是否允许锁定用户 - */ - @ApiModelProperty(value = "是否允许锁定用户", required = true) - @NotNull(message = "请选择是否允许锁定用户！") - @TypeMismatch(message = "是否允许锁定用户格式错误！") - private Boolean allowLock; - - /** - * 登录失败次数 - */ - @ApiModelProperty(value = "登录失败次数") - private Integer failNum; - - /** - * 是否允许验证码 - */ - @ApiModelProperty(value = "是否允许验证码", required = true) - @NotNull(message = "请选择是否允许验证码！") - @TypeMismatch(message = "是否允许验证码格式错误！") - private Boolean allowCaptcha; - - /** - * 是否开启忘记密码 - */ - @ApiModelProperty(value = "是否开启忘记密码", required = true) - @NotNull(message = "请选择是否开启忘记密码！") - @TypeMismatch(message = "是否开启忘记密码格式错误！") - private Boolean allowForgetPsw; - - /** - * 忘记密码是否使用邮箱 - */ - @ApiModelProperty(value = "忘记密码是否使用邮箱，allowForgetPsw == true时必填") - @TypeMismatch(message = "忘记密码是否使用邮箱格式错误！") - private Boolean forgetPswRequireMail; - - /** - * 忘记密码是否使用短信 - */ - @ApiModelProperty(value = "忘记密码是否使用短信，allowForgetPsw == true时必填") - @TypeMismatch(message = "忘记密码是否使用短信格式错误！") - private Boolean forgetPswRequireSms; - - /** - * signName - */ - @ApiModelProperty(value = "signName，forgetPswRequireSms == true时必填") - private String signName; - - /** - * templateCode - */ - @ApiModelProperty(value = "templateCode，forgetPswRequireSms == true时必填") - private String templateCode; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7b5b0edcd2aa7327ec0a534812415b59f9e8069b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/CreateSysDeptVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dept; - -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 CreateSysDeptVo 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(value = "简称", required = true) - @NotBlank(message = "简称不能为空！") - private String shortName; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b210969b9c0808a6e63dc1661c2b44b86b99b499..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/SysUserDeptSettingVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dept; - -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 SysUserDeptSettingVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @NotBlank(message = "用户ID不能为空！") - private String userId; - - /** - * 部门ID - */ - private List deptIds; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 23208a35b86ee320820508bb8df22f4936c3b4ef..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/UpdateSysDeptVo.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dept; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysDeptVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @IsCode - @NotBlank(message = "编号不能为空！") - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 简称 - */ - @ApiModelProperty(value = "简称", required = true) - @NotBlank(message = "简称不能为空！") - private String shortName; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "请选择状态！") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fa7cad581246ed907bb5c6b9ebbebf272c5e7b9a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/CreateSysDataDicVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic; - -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 CreateSysDataDicVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 98bec5339a927952490bdc571a42f598532721a9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/QuerySysDataDicVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic; - -import com.lframework.starter.web.vo.PageVo; -import com.lframework.starter.web.vo.SortPageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class QuerySysDataDicVo extends SortPageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index b45207539ce387640b4d6f0aaecee8c968c39274..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/SysDataDicSelectorVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDataDicSelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index a4148dc45fc20b8fd1a553f606cecaa306c72aab..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/UpdateSysDataDicVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysDataDicVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 分类ID - */ - @ApiModelProperty("分类ID") - private String categoryId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fad425dad6e7187a2e54d434a9b7e8fe6e3dc30a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/CreateSysDataDicCategoryVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic.category; - -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 CreateSysDataDicCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index badfdd74549efe214e3b1f91dea8a13f7fd59dca..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/SysDataDicCategorySelectorVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic.category; - -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysDataDicCategorySelectorVo extends PageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 48214f87611c5cb6f89e1f022e9d0fecba779aeb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/UpdateSysDataDicCategoryVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic.category; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysDataDicCategoryVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index df32917e5cf29119b3b9e8c248747e9925e60911..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/CreateSysDataDicItemVo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic.item; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class CreateSysDataDicItemVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 字典ID - */ - @ApiModelProperty("字典ID") - @NotBlank(message = "字典ID不能为空！") - private String dicId; - - /** - * 排序 - */ - @ApiModelProperty("排序") - @NotNull(message = "请输入排序！") - private Integer orderNo; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index d1e11f91e35cecefdc2bf707e7769bacdf6b2229..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/QuerySysDataDicItemVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic.item; - -import com.lframework.starter.web.vo.SortPageVo; -import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotBlank; -import lombok.Data; - -@Data -public class QuerySysDataDicItemVo extends SortPageVo { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 字典ID - */ - @ApiModelProperty("字典ID") - @NotBlank(message = "字典ID不能为空！") - private String dicId; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 04b275121006fa23e590d679f993c0e8c6d024a8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/UpdateSysDataDicItemVo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.dic.item; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysDataDicItemVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @NotBlank(message = "请输入编号！") - @IsCode - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 排序 - */ - @ApiModelProperty("排序") - @NotNull(message = "请输入排序！") - private Integer orderNo; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/CreateSysGenerateCodeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/CreateSysGenerateCodeVo.java deleted file mode 100644 index 034410613d844a6cbcb15571fdcc73ff4ec2d11b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/CreateSysGenerateCodeVo.java +++ /dev/null @@ -1,29 +0,0 @@ -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 javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class CreateSysGenerateCodeVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 规则ID - */ - @ApiModelProperty(value = "规则ID", required = true) - @NotNull(message = "请输入规则ID！") - private Integer id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/PreviewSysGenerateCodeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/PreviewSysGenerateCodeVo.java deleted file mode 100644 index 5a52ca39fa4ecb0d8b4d435df0ded9de2b2477b7..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/PreviewSysGenerateCodeVo.java +++ /dev/null @@ -1,23 +0,0 @@ -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 javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class PreviewSysGenerateCodeVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 配置规则 - */ - @ApiModelProperty(value = "配置规则", required = true) - @NotBlank(message = "配置规则不能为空！") - @IsJsonArray(message = "配置规则格式错误！") - private String configStr; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/QuerySysGenerateCodeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/QuerySysGenerateCodeVo.java deleted file mode 100644 index 4f7e489193d77784a587b867df674c892dd85a77..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/QuerySysGenerateCodeVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.generate; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class QuerySysGenerateCodeVo extends SortPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("规则ID") - private Integer id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/SettingSysGenerateCodeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/SettingSysGenerateCodeVo.java deleted file mode 100644 index 659bdee0974fb11d81f833718db647f3bf32e2d3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/SettingSysGenerateCodeVo.java +++ /dev/null @@ -1,30 +0,0 @@ -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 javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class SettingSysGenerateCodeVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private Integer id; - - /** - * 配置规则 - */ - @ApiModelProperty(value = "配置规则", required = true) - @NotBlank(message = "配置规则不能为空！") - @IsJsonArray(message = "配置规则格式错误！") - private String configStr; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 04727954adaf860d11bc9b45b314e7a973fd2925..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/CreateSysMenuVo.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.menu; - -import com.lframework.xingyun.template.inner.enums.system.SysMenuComponentType; -import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -/** - * 创建菜单Vo - */ -@Data -public class CreateSysMenuVo 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 title; - - /** - * 图标 - */ - @ApiModelProperty("图标") - private String icon; - - /** - * 类型 - */ - @ApiModelProperty(value = "类型", required = true) - @NotNull(message = "请选择类型！") - @IsEnum(message = "请选择类型！", enumClass = SysMenuDisplay.class) - private Integer display; - - /** - * 父级ID - */ - @ApiModelProperty("父级ID") - private String parentId; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - // 以下均为前端配置项 - - /** - * 路由名称 - */ - @ApiModelProperty("路由名称") - private String name; - - /** - * 组件类型 - */ - @ApiModelProperty("组件类型") - @IsEnum(message = "组件类型格式错误！", enumClass = SysMenuComponentType.class) - private Integer componentType; - - /** - * 组件 - */ - @ApiModelProperty("组件") - private String component; - - /** - * 自定义请求参数 - */ - @ApiModelProperty("自定义请求参数") - private String requestParam; - - /** - * 路径 - */ - @ApiModelProperty("路径") - private String path; - - /** - * 是否隐藏 - */ - @ApiModelProperty("是否隐藏") - private Boolean hidden; - - /** - * 是否不缓存 - */ - @ApiModelProperty("是否不缓存") - private Boolean noCache; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8f536f35c496a23dadc3a0224f1ee7732239b043..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/SysMenuSelectorVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.menu; - -import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; -import com.lframework.starter.web.components.validation.IsEnum; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SysMenuSelectorVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("类型") - @IsEnum(message = "类型格式不正确！", enumClass = SysMenuDisplay.class) - private Integer display; - - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ce6fe31e28863a04a39066b2e1f76cf93537c90d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/UpdateSysMenuVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.menu; - -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysMenuVo extends CreateSysMenuVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - @TypeMismatch(message = "状态格式有误！") - private Boolean available; -} 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 deleted file mode 100644 index 73856a49fd180f7ed5dbb7031e9138db441baa49..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/mail/QuerySysMailMessageVo.java +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 85ecd5b05f1a22d33bdb2c595630af5b7eff9a88..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageByUserVo.java +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index 3a5d5de5d78756cde12af9fd0efc029aa1d15bb8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageVo.java +++ /dev/null @@ -1,42 +0,0 @@ -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-sys/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 deleted file mode 100644 index 0ac2063894b1ab80516a9bb762ffd545d702e94a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/module/SysModuleTenantVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.module; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class SysModuleTenantVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - @Data - public static class SysModuleVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 模块ID - */ - @ApiModelProperty(value = "模块ID", required = true) - @NotNull(message = "模块ID不能为空！") - private Integer moduleId; - - /** - * 过期时间 - */ - @ApiModelProperty(value = "过期时间", required = true) - @NotNull(message = "过期时间不能为空！") - private LocalDateTime expireTime; - } - - /** - * 租户ID - */ - @ApiModelProperty(value = "租户ID", required = true) - @NotNull(message = "租户ID不能为空！") - private Integer tenantId; - - /** - * 模块 - */ - @ApiModelProperty("模块") - @Valid - private List modules; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index ee58cdca508f900d0fbd7cb841ad15fe0a77d621..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/CreateSysNoticeVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.notice; - -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class CreateSysNoticeVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 标题 - */ - @ApiModelProperty(value = "标题", required = true) - @NotBlank(message = "请输入标题！") - private String title; - - /** - * 内容 - */ - @ApiModelProperty(value = "内容", required = true) - @NotBlank(message = "请输入内容！") - private String content; - - /** - * 是否发布 - */ - @ApiModelProperty(value = "是否发布", required = true) - @TypeMismatch(message = "是否发布格式有误！") - @NotNull(message = "请选择是否发布！") - private Boolean published; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index f77bafdd1af0af1c66080a8921db64319f9df1ac..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeByUserVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.notice; - -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 QuerySysNoticeByUserVo 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/notice/QuerySysNoticeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeVo.java deleted file mode 100644 index c0c492213bf1af4d0b4cbe5447aff5fa995c1d40..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeVo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.notice; - -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 QuerySysNoticeVo 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 available; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index aa6eca019268dee802fbcce7fbcbe6e1dcf59735..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/UpdateSysNoticeVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.notice; - -import com.lframework.starter.web.components.validation.TypeMismatch; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysNoticeVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "id不能为空！") - private String id; - - /** - * 标题 - */ - @ApiModelProperty(value = "标题", required = true) - @NotBlank(message = "请输入标题！") - private String title; - - /** - * 内容 - */ - @ApiModelProperty(value = "内容", required = true) - @NotBlank(message = "请输入内容！") - private String content; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @TypeMismatch(message = "状态格式有误！") - @NotNull(message = "请选择状态！") - private Boolean available; - - /** - * 是否发布 - */ - @ApiModelProperty(value = "是否发布", required = true) - @TypeMismatch(message = "是否发布格式有误！") - @NotNull(message = "请选择是否发布！") - private Boolean published; -} 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 deleted file mode 100644 index aeacdd0ac44d1447937752fd19666f92418c4939..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/CreateSysNotifyGroupVo.java +++ /dev/null @@ -1,53 +0,0 @@ -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-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/QuerySysNotifyGroupVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/QuerySysNotifyGroupVo.java deleted file mode 100644 index e91fd772469954c02a309bbc0e84c171ca1301a5..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/QuerySysNotifyGroupVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.notify; - -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 java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QuerySysNotifyGroupVo extends SortPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 创建时间 起始时间 - */ - @ApiModelProperty("创建时间 起始时间") - @TypeMismatch(message = "创建时间起始时间格式有误！") - private LocalDateTime createTimeStart; - - /** - * 创建时间 截止时间 - */ - @ApiModelProperty("创建时间 截止时间") - @TypeMismatch(message = "创建时间截止时间格式有误！") - private LocalDateTime createTimeEnd; - - /** - * 状态 - */ - @ApiModelProperty("状态") - @TypeMismatch(message = "状态格式有误！") - private Boolean available; - -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/UpdateSysNotifyGroupVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/UpdateSysNotifyGroupVo.java deleted file mode 100644 index bcc2a9738a4d52c5aa8b8145d92a8a20269010c1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/UpdateSysNotifyGroupVo.java +++ /dev/null @@ -1,26 +0,0 @@ -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 UpdateSysNotifyGroupVo extends CreateSysNotifyGroupVo { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "id不能为空！") - private String id; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 050083fbae888b5ea8006cfb17f482a566ed80c6..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/CreateSysOpenDomainVo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.open; - -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 CreateSysOpenDomainVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * API密钥 - */ - @ApiModelProperty(value = "API密钥", required = true) - @NotBlank(message = "API密钥不能为空！") - private String apiSecret; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private Integer tenantId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 01b85acb4d82e54ba0d21020e91cf4670c47f93f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/QuerySysOpenDomainVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.open; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class QuerySysOpenDomainVo extends PageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6c01146f73b80da708d70e8634d96ff56c72cb64..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/SysOpenDomainSelectorVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.open; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SysOpenDomainSelectorVo extends PageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c3ed19f417d4d16cf5b55aac933360c40358175e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.open; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysOpenDomainVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private Long id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "名称不能为空！") - private String name; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private Integer tenantId; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 78dd0cb8399012bfea2882aecce0b9a68e64ed8f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/CreateSysParameterVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.parameter; - -import com.lframework.starter.web.components.validation.Pattern; -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 CreateSysParameterVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 键 - */ - @ApiModelProperty(value = "键", required = true) - @NotBlank(message = "请输入键！") - @Pattern(regexp = "^[A-Za-z0-9\\.\\-_]+$", message = "键只能由大写字母、小写字母、数字或._-组成") - private String pmKey; - - /** - * 值 - */ - @ApiModelProperty("值") - private String pmValue; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 0924ee3f4370ca57b2d93fa77aace471428288cd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/QuerySysParameterVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.parameter; - -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 java.time.LocalDateTime; -import lombok.Data; - -@Data -public class QuerySysParameterVo extends SortPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 键 - */ - @ApiModelProperty("键") - private String pmKey; - - /** - * 创建时间 起始时间 - */ - @ApiModelProperty("创建时间 起始时间") - @TypeMismatch(message = "创建时间起始时间格式有误！") - private LocalDateTime createTimeStart; - - /** - * 创建时间 截止时间 - */ - @ApiModelProperty("创建时间 截止时间") - @TypeMismatch(message = "创建时间截止时间格式有误！") - private LocalDateTime createTimeEnd; - -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 27d7e80a38b02404adc733c3a0892d283d9572e3..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/UpdateSysParameterVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.parameter; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysParameterVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "id不能为空！") - private Long id; - - /** - * 值 - */ - @ApiModelProperty("值") - private String pmValue; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/CreateSysDataPermissionDataVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/CreateSysDataPermissionDataVo.java deleted file mode 100644 index f28f5990b1901ec93e215b1701228d448d1bc80d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/CreateSysDataPermissionDataVo.java +++ /dev/null @@ -1,45 +0,0 @@ -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.inner.enums.system.SysDataPermissionDataBizType; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class CreateSysDataPermissionDataVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 业务ID - */ - @ApiModelProperty(value = "业务ID", required = true) - @NotEmpty(message = "业务ID不能为空！") - private List bizIds; - - /** - * 业务类型 - */ - @ApiModelProperty(value = "业务类型", required = true) - @NotNull(message = "业务类型不能为空！") - @IsEnum(message = "业务类型格式错误！", enumClass = SysDataPermissionDataBizType.class) - private Integer bizType; - - /** - * 权限类型 - */ - @ApiModelProperty(value = "权限类型", required = true) - @NotNull(message = "权限类型不能为空！") - private Integer permissionType; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/SysDataPermissionModelDetailVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/SysDataPermissionModelDetailVo.java deleted file mode 100644 index 97eee1e300cdac765bc1b919b7cccd0d4c23952b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/SysDataPermissionModelDetailVo.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.permission; - -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 SysDataPermissionModelDetailVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - - private String id; - - /** - * 明细ID - */ - @ApiModelProperty(value = "明细ID", required = true) - @NotNull(message = "明细ID不能为空！") - private Integer detailId; - - /** - * 节点类型 - */ - @ApiModelProperty(value = "节点类型", required = true) - @NotNull(message = "节点类型不能为空！") - private Integer nodeType; - - /** - * 计算类型 - */ - @ApiModelProperty("计算类型") - private Integer calcType; - - /** - * 值 - */ - @ApiModelProperty("值") - private String value; - - /** - * 值 - */ - @ApiModelProperty("值") - private List values; - - /** - * 条件类型 - */ - @ApiModelProperty("条件类型") - private Integer conditionType; - - /** - * 子节点 - */ - @ApiModelProperty("子节点") - private List children; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 3aa141eb3802600462b306e844b3691ee7498a85..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/CreateSysRoleVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.role; - -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 CreateSysRoleVo 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 permission; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 86948eeeedcf2ca5c2f02ecef125a7d01ec8ed06..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/QuerySysRoleVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.role; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class QuerySysRoleVo extends SortPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 8639e0e17580a793bf0262d7e83d8a63dd9eba5c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleMenuSettingVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.role; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import javax.validation.constraints.NotEmpty; -import lombok.Data; - -@Data -public class SysRoleMenuSettingVo implements BaseVo { - - /** - * 角色ID - */ - @ApiModelProperty(value = "角色ID", required = true) - @NotEmpty(message = "角色ID不能为空！") - private List roleIds; - - /** - * 菜单ID - */ - @ApiModelProperty("菜单ID") - private List menuIds; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 5b01fc3abcf7b8ad50a9384bdf695e2ac8f2b083..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleSelectorVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.role; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SysRoleSelectorVo extends PageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 9d6612438a07a9c399dc8918ae9085c591be7c11..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/UpdateSysRoleVo.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.role; - -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 javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateSysRoleVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @IsCode - @NotBlank(message = "请输入编号！") - private String code; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 权限 - */ - @ApiModelProperty("权限") - private String permission; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "状态不能为空！") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c3cfbe1306da9aaf8706259f0928894c20df6736..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/CreateTenantVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.tenant; - -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 CreateTenantVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * JdbcUrl - */ - @ApiModelProperty(value = "JdbcUrl", required = true) - @NotBlank(message = "请输入JdbcUrl！") - private String jdbcUrl; - - /** - * Jdbc用户名 - */ - @ApiModelProperty(value = "Jdbc用户名", required = true) - @NotBlank(message = "请输入Jdbc用户名！") - private String jdbcUsername; - - /** - * Jdbc密码 - */ - @ApiModelProperty(value = "Jdbc密码", required = true) - @NotBlank(message = "请输入Jdbc密码！") - private String jdbcPassword; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 00f5f7ac2db73bf26d4376059dc37b7f5b2429ab..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/QueryTenantVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.tenant; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.SortPageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class QueryTenantVo extends SortPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private String tenantId; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 78eb6fb858a571227b136c0ec3b5d9061ab0c60b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/TenantSelectorVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.tenant; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class TenantSelectorVo extends PageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 租户ID - */ - @ApiModelProperty("租户ID") - private String tenantId; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6ffbf1214a557ecfa2b36baf912323c7b1b5b96c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/UpdateTenantVo.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.tenant; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class UpdateTenantVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private Integer id; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * JdbcUrl - */ - @ApiModelProperty("JdbcUrl") - private String jdbcUrl; - - /** - * Jdbc用户名 - */ - @ApiModelProperty("Jdbc用户名") - private String jdbcUsername; - - /** - * Jdbc密码 - */ - @ApiModelProperty("Jdbc密码") - private String jdbcPassword; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "请选择状态！") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 7548b7006d45bea85da3ae0418d57e4365edb552..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.common.constants.PatternPool; -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.core.enums.Gender; -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 CreateSysUserVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @IsCode - @NotBlank(message = "请输入编号！") - @ApiModelProperty(value = "编号", required = true) - private String code; - - /** - * 姓名 - */ - @NotBlank(message = "请输入姓名！") - @ApiModelProperty(value = "姓名", required = true) - private String name; - - /** - * 用户名 - */ - @NotBlank(message = "请输入用户名！") - @ApiModelProperty(value = "用户名", required = true) - private String username; - - /** - * 密码 - */ - @Pattern(regexp = PatternPool.PATTERN_STR_PASSWORD, message = "密码长度必须为5-16位，只允许包含大写字母、小写字母、数字、下划线") - @NotBlank(message = "请输入密码！") - @ApiModelProperty(value = "密码", required = true) - private String password; - - /** - * 邮箱 - */ - @Pattern(regexp = PatternPool.PATTERN_STR_EMAIL, message = "邮箱地址格式不正确！") - @ApiModelProperty("邮箱") - private String email; - - /** - * 联系电话 - */ - @Pattern(regexp = PatternPool.PATTERN_STR_CN_TEL, message = "联系电话格式不正确！") - @ApiModelProperty("联系电话") - private String telephone; - - /** - * 性别 0-未知 1-男 2-女 - */ - @NotNull(message = "请选择性别！") - @IsEnum(message = "请选择性别！", enumClass = Gender.class) - @ApiModelProperty("性别") - private Integer gender; - - /** - * 部门ID - */ - @ApiModelProperty("部门ID") - private List deptIds; - - /** - * 角色ID - */ - @ApiModelProperty("角色ID") - private List roleIds; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetLoginCaptchaRequieVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetLoginCaptchaRequieVo.java deleted file mode 100644 index 1926cbd8d6e37310bbfaf3cdbf19d7aa0d41513c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetLoginCaptchaRequieVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * 用户登录请求参数 - */ -@Data -public class GetLoginCaptchaRequieVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 租户名称 - */ - @ApiModelProperty("租户名称") - private String tenantName; - - /** - * 用户名 - */ - @ApiModelProperty(value = "用户名", required = true) - @NotBlank(message = "用户名不能为空！") - private String username; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index c93cfb63e5db8e51da526fc749bbc92057134268..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetTelephoneLoginCaptchaVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.common.constants.PatternPool; -import com.lframework.starter.web.components.validation.Pattern; -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 GetTelephoneLoginCaptchaVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 手机号 - */ - @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = PatternPool.PATTERN_STR_CN_TEL, message = "手机号格式不正确！") - @NotBlank(message = "手机号不能为空！") - private String telephone; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 91da48abf8e7576ab3a9e4eebcd6340e96c4e51e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java +++ /dev/null @@ -1,48 +0,0 @@ -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; - -/** - * 用户登录请求参数 - */ -@Data -public class LoginVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 租户名称 - */ - @ApiModelProperty("租户名称") - private String tenantName; - - /** - * 用户名 - */ - @ApiModelProperty(value = "用户名", required = true) - @NotBlank(message = "用户名不能为空！") - private String username; - - /** - * 密码 - */ - @ApiModelProperty(value = "密码", required = true) - @NotBlank(message = "密码不能为空！") - private String password; - - /** - * sn - */ - @ApiModelProperty(value = "sn，验证码流水号", required = true) - private String sn; - - /** - * 验证码 - */ - @ApiModelProperty(value = "验证码", required = true) - private String captcha; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index bbf1f1db6650c32e077164d05a37321849386ab2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import com.lframework.starter.web.vo.SortPageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class QuerySysUserVo extends SortPageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 用户名 - */ - @ApiModelProperty("用户名") - private String username; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - /** - * 部门ID - */ - @ApiModelProperty("部门ID") - private String deptId; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 是否锁定 - */ - @ApiModelProperty("是否锁定") - private Boolean lockStatus; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 6b4f0f5356ed21537e37b35bd6148ff0a279b412..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/RegistUserVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.common.constants.PatternPool; -import com.lframework.starter.web.components.validation.Pattern; -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 RegistUserVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户名 - */ - @ApiModelProperty(value = "用户名", required = true) - @NotBlank(message = "用户名不能为空！") - private String username; - - /** - * 密码 - */ - @ApiModelProperty(value = "密码", required = true) - @Pattern(regexp = PatternPool.PATTERN_STR_PASSWORD, message = "密码长度必须为5-16位，只允许包含大写字母、小写字母、数字、下划线") - @NotBlank(message = "密码不能为空！") - private String password; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", required = true) - @NotBlank(message = "姓名不能为空！") - private String name; - - /** - * 邮箱 - */ - @ApiModelProperty("邮箱") - @Pattern(regexp = PatternPool.PATTERN_STR_EMAIL, message = "邮箱地址格式不正确！") - private String email; - - /** - * 联系电话 - */ - @ApiModelProperty("联系电话") - @Pattern(regexp = PatternPool.PATTERN_STR_CN_TEL, message = "联系电话格式不正确！") - private String telephone; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 64ecd58bfe3d033292bf5290cb345c3ec335c1f9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserRoleSettingVo.java +++ /dev/null @@ -1,27 +0,0 @@ -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 java.util.List; -import javax.validation.constraints.NotEmpty; -import lombok.Data; - -@Data -public class SysUserRoleSettingVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @ApiModelProperty(value = "用户ID", required = true) - @NotEmpty(message = "用户ID不能为空！") - private List userIds; - - /** - * 角色ID - */ - @ApiModelProperty("角色ID") - private List roleIds; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 76e910b28290ff0019a700ba481a968aefac651d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserSelectorVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.web.vo.BaseVo; -import com.lframework.starter.web.vo.PageVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.Data; - -@Data -public class SysUserSelectorVo extends PageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - - /** - * 姓名 - */ - @ApiModelProperty("姓名") - private String name; - - /** - * 用户名 - */ - @ApiModelProperty("用户名") - private String username; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 98556469234eb2dd4623c2d3d9df5266902fdf14..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneBindUserVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.common.constants.PatternPool; -import com.lframework.starter.web.components.validation.Pattern; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import lombok.Data; - -/** - * 手机号绑定用户 - * - * @author zmj - * @since 2022/4/25 - */ -@Data -public class TelephoneBindUserVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 手机号 - */ - @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = PatternPool.PATTERN_STR_CN_TEL, message = "手机号格式不正确！") - @NotBlank(message = "手机号不能为空！") - private String telephone; - - /** - * 用户名 - */ - @ApiModelProperty(value = "用户名", required = true) - @NotBlank(message = "用户名不能为空！") - private String username; - - /** - * 密码 - */ - @ApiModelProperty(value = "密码", required = true) - @NotBlank(message = "密码不能为空！") - private String password; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index 4d0f4b8b3245eede42187d7f8803374ea77a602c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneLoginVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.user; - -import com.lframework.starter.common.constants.PatternPool; -import com.lframework.starter.web.components.validation.Pattern; -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 TelephoneLoginVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 手机号 - */ - @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = PatternPool.PATTERN_STR_CN_TEL, message = "手机号格式不正确！") - @NotBlank(message = "手机号不能为空！") - private String telephone; - - /** - * 验证码 - */ - @ApiModelProperty(value = "验证码", required = true) - @NotBlank(message = "验证码不能为空！") - private String captcha; -} diff --git a/xingyun-sys/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 deleted file mode 100644 index fc51dc14b503bd30e5ebe04f381a509db40d5251..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java +++ /dev/null @@ -1,98 +0,0 @@ -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.core.enums.Gender; -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 UpdateSysUserVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotBlank(message = "ID不能为空！") - private String id; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号", required = true) - @IsCode - @NotBlank(message = "请输入编号！") - private String code; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名", required = true) - @NotBlank(message = "请输入姓名！") - private String name; - - /** - * 用户名 - */ - @ApiModelProperty(value = "用户名", required = true) - @NotBlank(message = "请输入用户名！") - private String username; - - /** - * 密码 如果不为空则为修改密码 - */ - @ApiModelProperty("密码 如果不为空则为修改密码") - private String password; - - /** - * 邮箱 - */ - @ApiModelProperty("邮箱") - private String email; - - /** - * 联系电话 - */ - @ApiModelProperty("联系电话") - private String telephone; - - /** - * 性别 - */ - @ApiModelProperty(value = "性别", required = true) - @NotNull(message = "请选择性别！") - @IsEnum(message = "请选择性别！", enumClass = Gender.class) - private Integer gender; - - /** - * 角色ID - */ - @ApiModelProperty("角色ID") - private List roleIds; - - /** - * 部门ID - */ - @ApiModelProperty("部门ID") - private List deptIds; - - /** - * 状态 - */ - @ApiModelProperty(value = "状态", required = true) - @NotNull(message = "请选择状态！") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-sys/src/main/java/lombok.config b/xingyun-sys/src/main/java/lombok.config deleted file mode 100644 index 8e37527a927dbd888d6f94d30ffd32395bb97676..0000000000000000000000000000000000000000 --- a/xingyun-sys/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-sys/src/main/resources/mappers/QrtzMapper.xml b/xingyun-sys/src/main/resources/mappers/QrtzMapper.xml deleted file mode 100644 index 916db3acbf078a11ae88cd991f515568d3acce08..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/QrtzMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - SELECT - job.JOB_NAME AS `name`, - job.JOB_GROUP AS `group`, - job.DESCRIPTION AS description, - cron.CRON_EXPRESSION AS cron, - tri.TRIGGER_STATE AS state - FROM qrtz_job_details AS job - LEFT JOIN qrtz_triggers AS tri ON job.JOB_NAME = tri.JOB_NAME AND job.JOB_GROUP = tri.JOB_GROUP - LEFT JOIN qrtz_cron_triggers AS cron ON cron.TRIGGER_NAME = tri.TRIGGER_NAME AND cron.TRIGGER_GROUP= tri.JOB_GROUP - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/SysParameterMapper.xml b/xingyun-sys/src/main/resources/mappers/SysParameterMapper.xml deleted file mode 100644 index 9e0ec73085eb990051b35e147cfd555b70dd2a2e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/SysParameterMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.pm_key, - tb.pm_value, - tb.description, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM sys_parameter AS tb - - diff --git a/xingyun-sys/src/main/resources/mappers/TenantMapper.xml b/xingyun-sys/src/main/resources/mappers/TenantMapper.xml deleted file mode 100644 index 49480c09c6dcc03b0ae1af43ab91c2d5ffc4a863..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/TenantMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - SELECT - tb.* - FROM tenant AS tb - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/UserDetailsMapper.xml b/xingyun-sys/src/main/resources/mappers/UserDetailsMapper.xml deleted file mode 100644 index b1eea9c45b27332a34be8cbe75d84747a7549d46..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/UserDetailsMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/DBMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/DBMapper.xml deleted file mode 100644 index 932e35e744ae12f096da822e64b02476e515bd89..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/DBMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml deleted file mode 100644 index 956ddbc1e87ac9923f8d36bfdb94068222124a8f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - SELECT - g.id, - g.required, - g.order_no - FROM gen_create_column_config AS g - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml deleted file mode 100644 index c5dda71cf7fafcaee6b39657e4222a1fb4f45111..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM gen_custom_list_category AS tb - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml deleted file mode 100644 index 11f584b1d1a7ca977c739d2c2a86bcd3071ffad8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - SELECT o.id, - o.custom_list_id, - o.name, - o.view_type, - o.btn_type, - o.btn_config, - o.icon, - o.request_param, - o.width, - o.order_no - FROM gen_custom_list_handle_column AS o - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListMapper.xml deleted file mode 100644 index daa9567869baf4ead2f4555c0b7e96261480c33d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - SELECT o.id, - o.name, - o.category_id, - o.data_obj_id, - o.list_type, - o.available, - o.description, - o.create_by, - o.create_time, - o.update_by, - o.update_time - FROM gen_custom_list AS o - - - - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml deleted file mode 100644 index c94155123b7b2ed57d6727a0e20dc47009f812f2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT o.id, - o.custom_list_id, - o.name, - o.view_type, - o.btn_type, - o.btn_config, - o.icon, - o.request_param, - o.order_no - FROM gen_custom_list_toolbar AS o - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml deleted file mode 100644 index f670010684e7fd1d0a8565078b134543724b8b89..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - SELECT - tb.* - FROM gen_custom_page_category AS tb - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageMapper.xml deleted file mode 100644 index 9f48acee611bcd2a6d9ba64e8e36763db5061305..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - SELECT - o.* - FROM gen_custom_page AS o - - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml deleted file mode 100644 index debf12182b941c00b89c9db7ff46512531708ac0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM gen_custom_selector_category AS tb - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml deleted file mode 100644 index 51fb811b5f470663be2395347734f9228d01c688..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - SELECT o.id, - o.name, - o.category_id, - o.custom_list_id, - o.available, - o.description, - o.create_by, - o.create_time, - o.update_by, - o.update_time - FROM gen_custom_selector AS o - - - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml deleted file mode 100644 index cecb0df981beddda09ab4cfc74fd333e4f2486a0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM gen_data_entity_category AS tb - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityMapper.xml deleted file mode 100644 index e3c5a9b3c201ff447ace129edad2d0d5cab6ca94..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - SELECT o.id, - o.name, - o.category_id, - o.available, - o.description, - o.create_by, - o.create_time, - o.update_by, - o.update_time, - o.gen_status - FROM gen_data_entity AS o - - - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml deleted file mode 100644 index 3cf68af8f57cda0f129404644fec9f5d16dce952..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenDataObjMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataObjMapper.xml deleted file mode 100644 index cebbbab77c57b0cab0d78d65e2b785947c65e0d0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenDataObjMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - SELECT o.id, - o.name, - o.category_id, - o.main_table_id, - o.main_table_alias, - o.available, - o.description, - o.create_by, - o.create_time, - o.update_by, - o.update_time - FROM gen_data_obj AS o - - - - - - - - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml deleted file mode 100644 index d7ced56c449162f1de4969712adec41a99774447..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - SELECT - g.id, - g.span, - g.order_no - FROM gen_detail_column_config AS g - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml deleted file mode 100644 index ef611ed24df243226363f4087e0954756091f55e..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - SELECT - i.id, - i.template_type, - i.package_name, - i.module_name, - i.biz_name, - i.class_name, - i.class_description, - i.parent_menu_id, - i.key_type, - i.author, - i.menu_code, - i.menu_name, - i.detail_span, - i.is_cache, - i.has_delete - FROM gen_generate_info AS i - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenMapper.xml deleted file mode 100644 index 8eb2a281e55c41c1a5a63366316258541a022564..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml deleted file mode 100644 index 3f2cad70ef8850b5d9f0a7564827215bc7675a52..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - SELECT - g.id, - g.width_type, - g.width, - g.sortable, - g.order_no - FROM gen_query_column_config AS g - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml deleted file mode 100644 index e724705b1b4240079d93275209d534846732bb55..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - SELECT - g.id, - g.query_type, - g.order_no - FROM gen_query_params_column_config AS g - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml deleted file mode 100644 index 879ab2498a99e6480d2fd5d533641ffa1bd6363d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableMapper.xml deleted file mode 100644 index 9dcf3fcfce9b70f4d0b1f5e67ea0beab550cc424..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - id, - table_name, - engine, - table_collation, - table_comment, - convert_type - FROM gen_simple_table - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml deleted file mode 100644 index fc2515d9859124a07318bc433ae8f7ba20c240f4..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - SELECT - g.id, - g.required, - g.order_no - FROM gen_update_column_config AS g - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml b/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml deleted file mode 100644 index 85db1633b089df3042610afbcef15bb36bebd9fd..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM gen_data_obj_category AS tb - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/gen/SimpleDBMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/SimpleDBMapper.xml deleted file mode 100644 index a87f8cfcec0889b433df4675356fdd933550e338..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/gen/SimpleDBMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml deleted file mode 100644 index f7f1813359f808b585576b968058b650c8564661..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM sys_data_dic_category AS tb - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysDataDicItemMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDataDicItemMapper.xml deleted file mode 100644 index 7682100e56e547eb08062990cb9c8357ce692e38..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysDataDicItemMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.dic_id, - tb.order_no, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM sys_data_dic_item AS tb - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysDataDicMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDataDicMapper.xml deleted file mode 100644 index 556bc82547bc1f091e1609da75416b48babe4c84..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysDataDicMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.name, - tb.category_id, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time - FROM sys_data_dic AS tb - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysDeptMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDeptMapper.xml deleted file mode 100644 index 308a9e31f723d7f670a42018a4a3a9d86f361074..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysDeptMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - SELECT - * - FROM sys_dept - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysGenerateCodeMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysGenerateCodeMapper.xml deleted file mode 100644 index 78ff42cc3b8fc41b309b6d9fe085a5e505d042e2..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysGenerateCodeMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - 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 deleted file mode 100644 index 752dd611da13d04a23ece255b1a4d385ba9cb69b..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysMailMessageMapper.xml.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - SELECT - tb.* - FROM sys_mail_message tb - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysMenuMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysMenuMapper.xml deleted file mode 100644 index 8eec8a4a92e79f81d137481c149b82e20d4d0a36..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysMenuMapper.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - SELECT id, - name, - path, - icon, - hidden, - display, - component_type, - component, - request_param, - parent_id, - title, - no_cache - FROM sys_menu - - - - SELECT - * - FROM sys_menu - - - - - - - - - - INSERT INTO sys_menu_collect (id, user_id, menu_id) VALUES (#{id}, #{userId}, #{menuId}) - - - DELETE FROM sys_menu_collect WHERE user_id = #{userId} AND menu_id = #{menuId} - - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysNoticeLogMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysNoticeLogMapper.xml deleted file mode 100644 index 67cd07a184b69cf88fad67368b2e05d347955868..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysNoticeLogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - SELECT - tb.id, - tb.notice_id, - tb.user_id, - tb.readed, - tb.read_time - FROM sys_notice_log AS tb - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysNoticeMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysNoticeMapper.xml deleted file mode 100644 index ba0a1b5589eed187b8da3a67f9494a5875e811c9..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysNoticeMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.title, - tb.content, - tb.available, - tb.published, - tb.publish_time, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time, - tb.readed_num, - tb.un_read_num - FROM sys_notice AS tb - - - - SELECT - tb.id, - tb.title, - tb.publish_time, - l.readed - FROM sys_notice_log AS l - INNER JOIN sys_notice AS tb ON tb.id = l.notice_id - - - - - UPDATE sys_notice SET readed_num = readed_num + 1, un_read_num = un_read_num - 1 WHERE id = #{id} - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysNotifyGroupMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysNotifyGroupMapper.xml deleted file mode 100644 index 733d6caa0377897a955f3c4a90419fdaffaf2a16..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysNotifyGroupMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - SELECT - tb.* - FROM sys_notify_group AS tb - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysOpenDomainMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysOpenDomainMapper.xml deleted file mode 100644 index 9f670d55d5d2e51fe299fdffd78258e3d9f05497..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysOpenDomainMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - SELECT - * - FROM sys_open_domain - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysRoleMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysRoleMapper.xml deleted file mode 100644 index fde24b476fc40533a7025006d9eb5137e90df525..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysRoleMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - SELECT - * - FROM sys_role - - - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysSiteMessageMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysSiteMessageMapper.xml deleted file mode 100644 index a66fd9345979b9096d0daf21dfb92d8ebe34368c..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysSiteMessageMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - SELECT - tb.* - FROM sys_site_message tb - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysUserDeptMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysUserDeptMapper.xml deleted file mode 100644 index 7e6fd0eb7c1dea34b73752628c240a1649f432ea..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysUserDeptMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - SELECT - ud.* - FROM sys_user_dept AS ud - INNER JOIN sys_dept AS d ON d.id = ud.dept_id - - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysUserMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysUserMapper.xml deleted file mode 100644 index 35b0d75288cf746c3a6e81282cc44e67ecca0b1a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysUserMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - SELECT - u.* - FROM sys_user AS u - - - - - - - - UPDATE sys_user - SET password = #{password} - WHERE id = #{userId} - - - - UPDATE sys_user - SET email = #{email} - WHERE id = #{userId} - - - - UPDATE sys_user - SET telephone = #{telephone} - WHERE id = #{userId} - - - UPDATE sys_user - SET lock_status = TRUE - WHERE id = #{id} - - - UPDATE sys_user - SET lock_status = FALSE - WHERE id = #{id} - - - - diff --git a/xingyun-sys/src/main/resources/mappers/system/SysUserRoleMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysUserRoleMapper.xml deleted file mode 100644 index 95b4ea766c0b916443494e04c3d4236161df3d62..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/mappers/system/SysUserRoleMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - SELECT - ur.* - FROM sys_user_role AS ur - INNER JOIN sys_role AS r ON r.id = ur.role_id - - - diff --git a/xingyun-sys/src/main/resources/templates/add.vue.ftl b/xingyun-sys/src/main/resources/templates/add.vue.ftl deleted file mode 100644 index 4fe8267770ffa27f467d4fcda1aa5ca296a06115..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/add.vue.ftl +++ /dev/null @@ -1,111 +0,0 @@ - - diff --git a/xingyun-sys/src/main/resources/templates/api.ts.ftl b/xingyun-sys/src/main/resources/templates/api.ts.ftl deleted file mode 100644 index 417c881d5bacf26233a7293f9774d903f2d05c4f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/api.ts.ftl +++ /dev/null @@ -1,113 +0,0 @@ -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-sys/src/main/resources/templates/controller.java.ftl b/xingyun-sys/src/main/resources/templates/controller.java.ftl deleted file mode 100644 index 9be2e8c62db40fcb4c992b68176f0956b23ab56f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/controller.java.ftl +++ /dev/null @@ -1,149 +0,0 @@ -package ${packageName}.controller.${moduleName}; - -<#if detail??> -import ${packageName}.bo.${moduleName}.${bizName}.Get${className}Bo; - -<#if query??> -import ${packageName}.bo.${moduleName}.${bizName}.Query${className}Bo; - -<#if queryParams??> -import ${packageName}.vo.${moduleName}.${bizName}.Query${className}Vo; - -import ${packageName}.service.${moduleName}.${className}Service; -<#if create??> -import ${packageName}.vo.${moduleName}.${bizName}.Create${className}Vo; - -<#if update??> -import ${packageName}.vo.${moduleName}.${bizName}.Update${className}Vo; - -import ${packageName}.entity.${className}; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import com.lframework.starter.web.controller.DefaultBaseController; -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.*; - -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.util.List; -import java.util.stream.Collectors; - -/** - * ${classDescription} Controller - * -<#if author??> - * @author ${author} - - */ -@Api(tags = "${classDescription}") -@Validated -@RestController -@RequestMapping("/${moduleName}/${bizName}") -public class ${className}Controller extends DefaultBaseController { - - @Autowired - private ${className}Service ${classNameProperty}Service; - <#if query?? && queryParams??> - - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @HasPermission({"${moduleName}:${bizName}:query"}) - @GetMapping("/query") - public ${r"InvokeResult>"} query(@Valid Query${className}Vo vo) { - - PageResult${r"<"}${className}${r">"} pageResult = ${classNameProperty}Service.query(getPageIndex(vo), getPageSize(vo), vo); - - List${r"<"}${className}${r">"} datas = pageResult.getDatas(); - List${r"<"}Query${className}Bo${r">"} results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(Query${className}Bo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - <#if detail??> - - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "${keys[0].name}", name = "${keys[0].name}", paramType = "query", required = true) - @HasPermission({"${moduleName}:${bizName}:query"}) - @GetMapping - public ${r"InvokeResult"} get(<#if keys[0].dataType == 'String'>@NotBlank<#else>@NotNull(message = "${keys[0].name}不能为空！") ${keys[0].dataType} ${keys[0].name}) { - - ${className} data = ${classNameProperty}Service.findById(${keys[0].name}); - if (data == null) { - throw new DefaultClientException("${classDescription}不存在！"); - } - - Get${className}Bo result = new Get${className}Bo(data); - - return InvokeResultBuilder.success(result); - } - - <#if create??> - - /** - * 新增 - */ - @ApiOperation("新增") - @HasPermission({"${moduleName}:${bizName}:add"}) - @PostMapping - public ${r"InvokeResult"} create(@Valid Create${className}Vo vo) { - - ${classNameProperty}Service.create(vo); - - return InvokeResultBuilder.success(); - } - - <#if update??> - - /** - * 修改 - */ - @ApiOperation("修改") - @HasPermission({"${moduleName}:${bizName}:modify"}) - @PutMapping - public ${r"InvokeResult"} update(@Valid Update${className}Vo vo) { - - ${classNameProperty}Service.update(vo); - <#if isCache> - - ${classNameProperty}Service.cleanCacheByKey(vo.get${keys[0].nameProperty}()); - - - return InvokeResultBuilder.success(); - } - - <#if hasDelete> - - /** - * 根据ID删除 - */ - @ApiOperation("根据ID删除") - @ApiImplicitParam(value = "${keys[0].name}", name = "${keys[0].name}", paramType = "query", required = true) - @HasPermission({"${moduleName}:${bizName}:delete"}) - @DeleteMapping - public ${r"InvokeResult"} deleteById(<#if keys[0].dataType == 'String'>@NotBlank<#else>@NotNull(message = "${keys[0].name}不能为空！") ${keys[0].dataType} ${keys[0].name}) { - - ${classNameProperty}Service.deleteById(${keys[0].name}); - <#if isCache> - - ${classNameProperty}Service.cleanCacheByKey(${keys[0].name}); - - - return InvokeResultBuilder.success(); - } - -} diff --git a/xingyun-sys/src/main/resources/templates/createvo.java.ftl b/xingyun-sys/src/main/resources/templates/createvo.java.ftl deleted file mode 100644 index bb4b6f8607920d6b7b79fb53e15e2e46395e1589..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/createvo.java.ftl +++ /dev/null @@ -1,51 +0,0 @@ -package ${packageName}.vo.${moduleName}.${bizName}; - -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import java.io.Serializable; -import lombok.Data; - -@Data -public class Create${className}Vo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - <#list columns as column> - /** - * ${column.description} - */ - <#if column.required> - @ApiModelProperty(value = "${column.description}", required = true) - <#else> - @ApiModelProperty("${column.description}") - - <#if column.required> - @${column.validateAnno}(message = "${column.validateMsg}${column.description}！") - <#if column.fixEnum> - @IsEnum(message = "${column.validateMsg}${column.description}！", enumClass = ${column.dataType}.class) - - - <#if column.regularExpression??> - @Pattern(regexp = "${column.regularExpression?replace("\\", "\\\\")}", message = "${column.description}格式有误！") - - <#if column.dataType != 'String'> - @TypeMismatch(message = "${column.description}格式有误！") - - <#if column.isDecimalType> - <#if (column.decimals??) && column.decimals gt 0> - @IsNumberPrecision(message = "${column.description}最多允许${column.decimals}位小数！", value = ${column.decimals}) - - <#else> - <#if column.dataType == 'String' && (column.viewType == 0 || column.viewType == 1)> - <#if (column.len??) && column.len gt 0> - @Length(message = "${column.description}最多允许${column.len}个字符！") - - - - private <#if column.fixEnum>${column.enumCodeType}<#else>${column.dataType} ${column.name}; - - -} diff --git a/xingyun-sys/src/main/resources/templates/createvo.ts.ftl b/xingyun-sys/src/main/resources/templates/createvo.ts.ftl deleted file mode 100644 index 0ce281e2b26c880dbe1cbac731b4ddf6c720d1b8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/createvo.ts.ftl +++ /dev/null @@ -1,10 +0,0 @@ -export interface Create${className}Vo { - - <#list columns as column> - /** - * ${column.description} - */ - ${column.name}<#if !column.required>?: ${column.frontDataType}; - - -} diff --git a/xingyun-sys/src/main/resources/templates/detail.vue.ftl b/xingyun-sys/src/main/resources/templates/detail.vue.ftl deleted file mode 100644 index 2f6deadc7e6a68b02ac6825aaf833d5ff6c3e8be..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/detail.vue.ftl +++ /dev/null @@ -1,91 +0,0 @@ - - diff --git a/xingyun-sys/src/main/resources/templates/entity.java.ftl b/xingyun-sys/src/main/resources/templates/entity.java.ftl deleted file mode 100644 index 43deaadae5d4a21becdfffff24e12cc748a175bb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/entity.java.ftl +++ /dev/null @@ -1,49 +0,0 @@ -package ${packageName}.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import lombok.Data; - -/** - *

- * ${classDescription} - *

- * -<#if author??> - * @author ${author} - - */ -@Data -@TableName("${tableName}") -public class ${className} extends BaseEntity implements BaseDto { - - private static final long serialVersionUID = 1L; - - public static final String CACHE_NAME = "${className}"; - - <#list columns as column> - /** - * ${column.description} - */ - <#if !column.defaultConvertType> - <#if !column.isKey> - @TableField(value = "${column.columnName}"<#if column.fill?? && column.fill>, fill = FieldFill.${column.fillStrategy}) - <#else> - @TableId(value = "${column.columnName}"<#if column.autoIncrKey>, type = IdType.AUTO<#if column.fill?? && column.fill>, fill = FieldFill.${column.fillStrategy}<#if column.autoIncrKey>, type = IdType.AUTO) - - <#else> - <#if !column.isKey && column.fill?? && column.fill> - @TableField(fill = FieldFill.${column.fillStrategy}) - - - <#if column.defaultConvertType && column.isKey && column.autoIncrKey> - @TableId(value = "${column.columnName}", type = IdType.AUTO) - - private ${column.dataType} ${column.name}; - - -} diff --git a/xingyun-sys/src/main/resources/templates/getbo.java.ftl b/xingyun-sys/src/main/resources/templates/getbo.java.ftl deleted file mode 100644 index 8a01ec2a9a2b9bd9e6f6984d1fe858d74ee78cd8..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/getbo.java.ftl +++ /dev/null @@ -1,97 +0,0 @@ -package ${packageName}.bo.${moduleName}.${bizName}; - -import com.fasterxml.jackson.annotation.JsonFormat; -import ${packageName}.entity.${className}; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - - -import lombok.Data; - -/** - *

- * ${classDescription} GetBo - *

- * -<#if author??> - * @author ${author} - - */ -@Data -public class Get${className}Bo extends BaseBo${r"<"}${className}${r">"} { - - /** - * ${keys[0].description} - */ - @ApiModelProperty("${keys[0].description}") - private ${keys[0].dataType} ${keys[0].name}; - - <#list columns as column> - /** - * ${column.description} - */ - @ApiModelProperty("${column.description}") - <#if column.dataType == 'LocalDateTime'> - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - - <#if column.dataType == 'LocalDate'> - @JsonFormat(pattern = StringPool.DATE_PATTERN) - - <#if column.dataType == 'LocalTime'> - @JsonFormat(pattern = StringPool.TIME_PATTERN) - - private <#if column.fixEnum>${column.enumCodeType}<#else>${column.dataType} ${column.name}; - - <#if column.dataDicCode??> - /** - * ${column.description}字典值 - */ - @ApiModelProperty("${column.description}字典值") - private String ${column.name}DicValue; - - - - public Get${className}Bo() { - - } - - public Get${className}Bo(${className} dto) { - - super(dto); - } - - @Override - public BaseBo${r"<"}${className}${r">"} convert(${className} dto) { - <#if hasFixEnum> - return super.convert(dto<#list columns as column><#if column.fixEnum>, Get${className}Bo::get${column.nameProperty}); - <#else> - return super.convert(dto); - - } - - @Override - protected void afterInit(${className} dto) { - - <#list columns as column> - <#if column.dataDicCode??> - ISysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(ISysDataDicItemService.class); - - <#break> - - - <#list columns as column> - <#if column.fixEnum> - this.${column.name} = dto.get${column.nameProperty}().getCode(); - - <#elseif column.dataDicCode??> - if (!StringUtil.isBlank(dto.get${column.nameProperty}())) { - String[] ${column.name}DicArr = dto.get${column.nameProperty}().split(StringPool.DATA_DIC_SPLIT); - this.${column.name}DicValue = sysDataDicItemService.findByCode(${column.name}DicArr[0], ${column.name}DicArr[1]).getName(); - } - - - - } -} diff --git a/xingyun-sys/src/main/resources/templates/getbo.ts.ftl b/xingyun-sys/src/main/resources/templates/getbo.ts.ftl deleted file mode 100644 index d4908caab6d95557159a92ecd75bcdf75a2be14a..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/getbo.ts.ftl +++ /dev/null @@ -1,29 +0,0 @@ -/** - * ${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-sys/src/main/resources/templates/index.vue.ftl b/xingyun-sys/src/main/resources/templates/index.vue.ftl deleted file mode 100644 index 5a0451948858ececdbf5529f48ee19f7e93f6d07..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/index.vue.ftl +++ /dev/null @@ -1,205 +0,0 @@ - - - - diff --git a/xingyun-sys/src/main/resources/templates/input-components.ftl b/xingyun-sys/src/main/resources/templates/input-components.ftl deleted file mode 100644 index f0f49c0fc95cc054d9a098961aec45d3f1fe3468..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/input-components.ftl +++ /dev/null @@ -1,78 +0,0 @@ -<#if column.viewType == 0> - max-length="${column.len}" allow-clear /> -<#elseif column.viewType == 1> - 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> - - 是 - 否 - - - -<#elseif column.viewType == 6> -<#if column.dataType == 'LocalDateTime'> -
- - 至 - -
-<#else> -
- - 至 - -
- -<#elseif column.viewType == 7> - -<#elseif column.viewType == 8> - - diff --git a/xingyun-sys/src/main/resources/templates/mapper.java.ftl b/xingyun-sys/src/main/resources/templates/mapper.java.ftl deleted file mode 100644 index 4a0f8d0f893b611708cb05270455a46f1b616934..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/mapper.java.ftl +++ /dev/null @@ -1,35 +0,0 @@ -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; - -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * ${classDescription} Mapper 接口 - *

- * -<#if author??> - * @author ${author} - - */ -public interface ${className}Mapper extends BaseMapper<${className}> { - - <#if queryParams??> - /** - * 查询列表 - * @param vo - * @return - */ - List${r"<"}${className}${r">"} query(@Param("vo") Query${className}Vo vo); - -} diff --git a/xingyun-sys/src/main/resources/templates/mapper.list.xml.ftl b/xingyun-sys/src/main/resources/templates/mapper.list.xml.ftl deleted file mode 100644 index f77ad20e425f2fb7aef3c8d2d2faad0bac0711e0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/mapper.list.xml.ftl +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - <#list entity.columns as column> - <#if column.isKey> - - <#else> - - - - - - - SELECT - <#list entity.columns as column> - tb.${column.columnName}<#if column_index != entity.columns?size - 1>, - - FROM ${entity.tableName} AS tb - - - <#if queryParams??> - - - diff --git a/xingyun-sys/src/main/resources/templates/modify.vue.ftl b/xingyun-sys/src/main/resources/templates/modify.vue.ftl deleted file mode 100644 index 3bf5a73ff6f50ce1aa25b870096028e8509476a1..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/modify.vue.ftl +++ /dev/null @@ -1,128 +0,0 @@ - - diff --git a/xingyun-sys/src/main/resources/templates/query-type-sql.ftl b/xingyun-sys/src/main/resources/templates/query-type-sql.ftl deleted file mode 100644 index 855edb9a128838992a2e46c63b7a923f1132ba81..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/query-type-sql.ftl +++ /dev/null @@ -1,27 +0,0 @@ -<#if column.queryType == 0> -AND tb.${column.columnName} = ${r"#{vo."}${column.name}${r"}"} -<#elseif column.queryType == 1> -AND tb.${column.columnName} > ${r"#{vo."}${column.name}${r"}"} -<#elseif column.queryType == 2> -AND tb.${column.columnName} >= ${r"#{vo."}${column.name}${r"}"} -<#elseif column.queryType == 3> - -<#elseif column.queryType == 4> - -<#elseif column.queryType == 5> -AND tb.${column.columnName} != ${r"#{vo."}${column.name}${r"}"} -<#elseif column.queryType == 6> -AND tb.${column.columnName} IN (${r"#{vo."}${column.name}${r"}"}) -<#elseif column.queryType == 7> -AND tb.${column.columnName} NOT IN (${r"#{vo."}${column.name}${r"}"}) -<#elseif column.queryType == 8> -AND tb.${column.columnName} LIKE CONCAT('%', ${r"#{vo."}${column.name}${r"}"}) -<#elseif column.queryType == 9> -AND tb.${column.columnName} LIKE CONCAT(${r"#{vo."}${column.name}${r"}"}, '%') -<#elseif column.queryType == 10> -AND tb.${column.columnName} LIKE CONCAT('%', ${r"#{vo."}${column.name}${r"}"}, '%') - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/templates/querybo.java.ftl b/xingyun-sys/src/main/resources/templates/querybo.java.ftl deleted file mode 100644 index 2284bf8e1629d762cec09a21893aec05bd3b9b18..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/querybo.java.ftl +++ /dev/null @@ -1,89 +0,0 @@ -package ${packageName}.bo.${moduleName}.${bizName}; - -import com.fasterxml.jackson.annotation.JsonFormat; -import ${packageName}.entity.${className}; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - - -import lombok.Data; - -/** - *

- * ${classDescription} QueryBo - *

- * -<#if author??> - * @author ${author} - - */ -@Data -public class Query${className}Bo extends BaseBo${r"<"}${className}${r">"} { - - /** - * ${keys[0].description} - */ - @ApiModelProperty("${keys[0].description}") - private ${keys[0].dataType} ${keys[0].name}; - -<#list columns as column> - /** - * ${column.description} - */ - @ApiModelProperty("${column.description}") - <#if column.dataType == 'LocalDateTime'> - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - - <#if column.dataType == 'LocalDate'> - @JsonFormat(pattern = StringPool.DATE_PATTERN) - - <#if column.dataType == 'LocalTime'> - @JsonFormat(pattern = StringPool.TIME_PATTERN) - - private <#if column.fixEnum>${column.enumCodeType}<#else>${column.dataType} ${column.name}; - - - public Query${className}Bo() { - - } - - public Query${className}Bo(${className} dto) { - - super(dto); - } - - @Override - public BaseBo${r"<"}${className}${r">"} convert(${className} dto) { - <#if hasFixEnum> - return super.convert(dto<#list columns as column><#if column.fixEnum>, Query${className}Bo::get${column.nameProperty}); - <#else> - return super.convert(dto); - - } - - @Override - protected void afterInit(${className} dto) { - - <#list columns as column> - <#if column.dataDicCode??> - ISysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(ISysDataDicItemService.class); - - <#break> - - - <#list columns as column> - <#if column.fixEnum> - this.${column.name} = dto.get${column.nameProperty}().getCode(); - - <#elseif column.dataDicCode??> - if (!StringUtil.isBlank(dto.get${column.nameProperty}())) { - String[] ${column.name}DicArr = dto.get${column.nameProperty}().split(StringPool.DATA_DIC_SPLIT); - this.${column.name} = sysDataDicItemService.findByCode(${column.name}DicArr[0], ${column.name}DicArr[1]).getName(); - } - - - - } -} diff --git a/xingyun-sys/src/main/resources/templates/querybo.ts.ftl b/xingyun-sys/src/main/resources/templates/querybo.ts.ftl deleted file mode 100644 index 6d2c4f692b444b424ae479e2baa46e43628ca5bb..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/querybo.ts.ftl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * ${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-sys/src/main/resources/templates/queryvo.java.ftl b/xingyun-sys/src/main/resources/templates/queryvo.java.ftl deleted file mode 100644 index 64374a58c9141d6b0a846e853868e0f17afc7c7d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/queryvo.java.ftl +++ /dev/null @@ -1,57 +0,0 @@ -package ${packageName}.vo.${moduleName}.${bizName}; - -import lombok.Data; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import java.io.Serializable; - -@Data -public class Query${className}Vo extends PageVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - <#list columns as column> - <#if column.viewType != 6> - /** - * ${column.description} - */ - @ApiModelProperty("${column.description}") - - <#if column.fixEnum> - <#if column.dataType != 'String'> - @TypeMismatch(message = "${column.description}格式有误！") - - @IsEnum(message = "${column.description}格式有误！", enumClass = ${column.dataType}.class) - private ${column.enumCodeType} ${column.name}; - <#else> - <#if column.viewType == 6> - /** - * ${column.description} 起始时间 - */ - @ApiModelProperty("${column.description} 起始时间") - <#if column.dataType != 'String'> - @TypeMismatch(message = "${column.description}起始时间格式有误！") - - private ${column.dataType} ${column.name}Start; - - /** - * ${column.description} 截止时间 - */ - @ApiModelProperty("${column.description} 截止时间") - <#if column.dataType != 'String'> - @TypeMismatch(message = "${column.description}截止时间格式有误！") - - private ${column.dataType} ${column.name}End; - <#else> - <#if column.dataType != 'String'> - @TypeMismatch(message = "${column.description}格式有误！") - - private ${column.dataType} ${column.name}; - - - - -} diff --git a/xingyun-sys/src/main/resources/templates/queryvo.ts.ftl b/xingyun-sys/src/main/resources/templates/queryvo.ts.ftl deleted file mode 100644 index c22936310aeea527cb0f897a7aa45d1f68f96c30..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/queryvo.ts.ftl +++ /dev/null @@ -1,25 +0,0 @@ -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-sys/src/main/resources/templates/service.java.ftl b/xingyun-sys/src/main/resources/templates/service.java.ftl deleted file mode 100644 index 6262ed189077f10f5d7af23e5dd128ba71d3c96f..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/service.java.ftl +++ /dev/null @@ -1,79 +0,0 @@ -package ${packageName}.service.${moduleName}; - -<#if create??> -import ${packageName}.vo.${moduleName}.${bizName}.Create${className}Vo; - -<#if queryParams??> -import ${packageName}.vo.${moduleName}.${bizName}.Query${className}Vo; - -<#if update??> -import ${packageName}.vo.${moduleName}.${bizName}.Update${className}Vo; - -import ${packageName}.entity.${className}; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import java.util.Collection; -import java.util.List; - -/** - * ${classDescription} Service -<#if author??> - * - * @author ${author} - - */ -public interface ${className}Service extends BaseMpService${r"<"}${className}${r">"} { - - <#if queryParams??> - /** - * 查询列表 - * @return - */ - PageResult${r"<"}${className}${r">"} query(Integer pageIndex, Integer pageSize, Query${className}Vo vo); - - - <#if queryParams??> - /** - * 查询列表 - * @param vo - * @return - */ - ${r"List<"}${className}${r">"} query(Query${className}Vo vo); - - - /** - * 根据ID查询 - * @param ${keys[0].name} - * @return - */ - ${className} findById(<#list keys as key>${key.dataType} ${key.name}<#if key_index != keys?size - 1>, ); - - <#if create??> - /** - * 创建 - * @param vo - * @return - */ - ${create.keys[0].dataType} create(Create${className}Vo vo); - - - <#if update??> - /** - * 修改 - * @param vo - */ - void update(Update${className}Vo vo); - - - <#if hasDelete> - /** - * 根据ID删除 - * @param ${keys[0].name} - * @return - */ - void deleteById(<#list keys as key>${key.dataType} ${key.name}<#if key_index != keys?size - 1>, ); - -} diff --git a/xingyun-sys/src/main/resources/templates/serviceimpl.java.ftl b/xingyun-sys/src/main/resources/templates/serviceimpl.java.ftl deleted file mode 100644 index bd9483cb3cda16cf00d0f9cbce9326b5f5e4e99d..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/serviceimpl.java.ftl +++ /dev/null @@ -1,167 +0,0 @@ -package ${packageName}.impl.${moduleName}; - -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 ${packageName}.entity.${className}; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import ${packageName}.mappers.${className}Mapper; -import ${packageName}.service.${moduleName}.${className}Service; -<#if create??> -import ${packageName}.vo.${moduleName}.${bizName}.Create${className}Vo; - -<#if queryParams??> -import ${packageName}.vo.${moduleName}.${bizName}.Query${className}Vo; - -<#if update??> -import ${packageName}.vo.${moduleName}.${bizName}.Update${className}Vo; - -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; - -import java.util.Collection; -import java.util.List; - -@Service -public class ${className}ServiceImpl extends BaseMpServiceImpl${r"<"}${className}Mapper, ${className}${r">"} implements ${className}Service { -<#if queryParams??> - - @Override - public PageResult${r"<"}${className}${r">"} query(Integer pageIndex, Integer pageSize, Query${className}Vo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List${r"<"}${className}${r">"} datas = this.query(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - -<#if queryParams??> - - @Override - public List${r"<"}${className}${r">"} query(Query${className}Vo vo) { - - return getBaseMapper().query(vo); - } - - -<#if isCache> - @Cacheable(value = ${className}.CACHE_NAME, key = "@cacheVariables.tenantId() + #${keys[0].name}", unless = "#result == null") - - @Override - public ${className} findById(<#list keys as key>${key.dataType} ${key.name}<#if key_index != keys?size - 1>, ) { - - return getBaseMapper().selectById(${keys[0].name}); - } -<#if create??> - - @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) { - - ${className} data = new ${className}(); - <#if create.appointId> - data.set${create.keys[0].nameProperty}(${create.idCode}); - - <#list create.columns as column> - <#if column.required> - <#if column.fixEnum> - data.set${column.nameProperty}(EnumUtil.getByCode(${column.dataType}.class, vo.get${column.nameProperty}())); - <#else> - data.set${column.nameProperty}(vo.get${column.nameProperty}()); - - <#else> - <#if column.dataType == 'String'> - if (!StringUtil.isBlank(vo.get${column.nameProperty}())) { - data.set${column.nameProperty}(vo.get${column.nameProperty}()); - } - <#else> - if (vo.get${column.nameProperty}() != null) { - <#if column.fixEnum> - data.set${column.nameProperty}(EnumUtil.getByCode(${column.dataType}.class, vo.get${column.nameProperty}())); - <#else> - data.set${column.nameProperty}(vo.get${column.nameProperty}()); - - } - - - - - getBaseMapper().insert(data); - - OpLogUtil.setVariable("${create.keys[0].name}", <#if create.keys[0].dataType == 'String'>data.get${create.keys[0].nameProperty}()<#else>String.valueOf(data.get${create.keys[0].nameProperty}())); - OpLogUtil.setExtra(vo); - - return data.get${create.keys[0].nameProperty}(); - } - -<#if update??> - - @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) { - - ${className} data = getBaseMapper().selectById(vo.get${update.keys[0].nameProperty}()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("${classDescription}不存在！"); - } - - LambdaUpdateWrapper${r"<"}${className}${r">"} updateWrapper = Wrappers.lambdaUpdate(${className}.class) - <#list update.columns as column> - <#if column.required> - <#if column.fixEnum> - .set(${className}::get${column.nameProperty}, EnumUtil.getByCode(${column.dataType}.class, vo.get${column.nameProperty}())) - <#else> - .set(${className}::get${column.nameProperty}, vo.get${column.nameProperty}()) - - <#else> - <#if column.dataType == 'String'> - .set(${className}::get${column.nameProperty}, StringUtil.isBlank(vo.get${column.nameProperty}()) ? null : vo.get${column.nameProperty}()) - <#else> - <#if column.fixEnum> - .set(${className}::get${column.nameProperty}, vo.get${column.nameProperty}() == null ? null : EnumUtil.getByCode(${column.dataType}.class, vo.get${column.nameProperty}())) - <#else> - .set(${className}::get${column.nameProperty}, vo.get${column.nameProperty}() == null ? null : vo.get${column.nameProperty}()) - - - - - .eq(${className}::get${update.keys[0].nameProperty}, vo.get${update.keys[0].nameProperty}()); - - getBaseMapper().update(updateWrapper); - - OpLogUtil.setVariable("${update.keys[0].name}", <#if update.keys[0].dataType == 'String'>data.get${update.keys[0].nameProperty}()<#else>String.valueOf(data.get${update.keys[0].nameProperty}())); - OpLogUtil.setExtra(vo); - } - - <#if hasDelete> - - @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>, ) { - - getBaseMapper().deleteById(<#list keys as key>${key.name}<#if key_index != keys?size - 1>, ); - } - - - <#if isCache> - @CacheEvict(value = ${className}.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-sys/src/main/resources/templates/sql.ftl b/xingyun-sys/src/main/resources/templates/sql.ftl deleted file mode 100644 index 789c3206e2ae1fcab890f096d635d7e353e012a0..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/sql.ftl +++ /dev/null @@ -1,9 +0,0 @@ --- 功能菜单SQL -INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `component`, `parent_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('${menuId}', '${menuCode}', '${className}', '${menuName}', '/${moduleName}/${bizName}/index', <#if parentMenuId??>'${parentMenuId}'<#else>NULL, '/${moduleName}/${bizName}', 0, 1, 0, '${moduleName}:${bizName}:query', 0, 1, '', '1', NOW(), '1', NOW()); --- 权限SQL -<#if create??> -INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `component`, `parent_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('${IdUtil.getId()}', '${menuCode}001', '', '新增${classDescription}', '', '${menuId}', '', 0, 2, 0, '${moduleName}:${bizName}:add', 0, 1, '', '1', NOW(), '1', NOW()); - -<#if update??> -INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `component`, `parent_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('${IdUtil.getId()}', '${menuCode}002', '', '修改${classDescription}', '', '${menuId}', '', 0, 2, 0, '${moduleName}:${bizName}:modify', 0, 1, '', '1', NOW(), '1', NOW()); - \ No newline at end of file diff --git a/xingyun-sys/src/main/resources/templates/updatevo.java.ftl b/xingyun-sys/src/main/resources/templates/updatevo.java.ftl deleted file mode 100644 index 7e632921584dc18c6fe97769353a0bd5ad4cf022..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/updatevo.java.ftl +++ /dev/null @@ -1,62 +0,0 @@ -package ${packageName}.vo.${moduleName}.${bizName}; - -import lombok.Data; -<#if importPackages??> - <#list importPackages as p> -import ${p}; - - -import java.io.Serializable; - -@Data -public class Update${className}Vo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ${keys[0].description} - */ - @ApiModelProperty(value = "${keys[0].description}", required = true) -<#if keys[0].dataType == 'String'> - @NotBlank(message = "${keys[0].name}不能为空！") -<#else> - @NotNull(message = "${keys[0].name}不能为空！") - - private ${keys[0].dataType} ${keys[0].name}; - -<#list columns as column> - /** - * ${column.description} - */ - <#if column.required> - @ApiModelProperty(value = "${column.description}", required = true) - <#else> - @ApiModelProperty("${column.description}") - - <#if column.dataType != 'String'> - @TypeMismatch(message = "${column.description}格式有误！") - - <#if column.required> - @${column.validateAnno}(message = "${column.validateMsg}${column.description}！") - <#if column.fixEnum> - @IsEnum(message = "${column.validateMsg}${column.description}！", enumClass = ${column.dataType}.class) - - - <#if column.regularExpression??> - @Pattern(regexp = "${column.regularExpression?replace("\\", "\\\\")}", message = "${column.description}格式有误！") - - <#if column.isDecimalType> - <#if (column.decimals??) && column.decimals gt 0> - @IsNumberPrecision(message = "${column.description}最多允许${column.decimals}位小数！", value = ${column.decimals}) - - <#else> - <#if column.dataType == 'String' && (column.viewType == 0 || column.viewType == 1)> - <#if (column.len??) && column.len gt 0> - @Length(message = "${column.description}最多允许${column.len}个字符！") - - - - private <#if column.fixEnum>${column.enumCodeType}<#else>${column.dataType} ${column.name}; - - -} diff --git a/xingyun-sys/src/main/resources/templates/updatevo.ts.ftl b/xingyun-sys/src/main/resources/templates/updatevo.ts.ftl deleted file mode 100644 index 747d111ab3c164f90d075e1dccc08d1c6003a095..0000000000000000000000000000000000000000 --- a/xingyun-sys/src/main/resources/templates/updatevo.ts.ftl +++ /dev/null @@ -1,17 +0,0 @@ - -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}; - - -}