joylink
/
rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test'

This commit is contained in:
joylink_zhangsai 2021-04-12 18:50:08 +08:00
parent 7fad4fd3ae 87aab8ab15
commit 9656fdb80e
652 changed files with 37992 additions and 8923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pom.xml
View File

@ -28,6 +28,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
@ -98,8 +102,34 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.wechatpay-apiv3</groupId>
<artifactId>wechatpay-apache-httpclient</artifactId>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.huawei.sis</groupId>
<artifactId>huaweicloud-java-sdk-sis</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>sis-repo</id>
<name>Sis Release Repository</name>
<url>https://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<build>
<plugins>
<plugin>

102
sql/20210108-dukang.sql Normal file
View File

@ -0,0 +1,102 @@
ALTER TABLE `sys_user`
DROP COLUMN `company_id`;
CREATE TABLE `company_department` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`name` VARCHAR(32) NOT NULL COMMENT '部门名称' COLLATE 'utf8_general_ci',
`company_id` INT(11) NOT NULL COMMENT '单位id',
`parent_id` INT(11) NULL DEFAULT NULL COMMENT '父级id',
PRIMARY KEY (`id`),
INDEX `FK_company_department_company` (`company_id`),
INDEX `FK_company_department_company_department` (`parent_id`),
CONSTRAINT `FK_company_department_company` FOREIGN KEY (`company_id`) REFERENCES `company` (`id`) ON DELETE CASCADE,
CONSTRAINT `FK_company_department_company_department` FOREIGN KEY (`parent_id`) REFERENCES `company_department` (`id`) ON DELETE SET NULL
)
COMMENT='单位部门信息'
COLLATE='utf8_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `company_position` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`name` VARCHAR(32) NOT NULL COMMENT '职位名称' COLLATE 'utf8_general_ci',
`company_id` INT(11) NOT NULL COMMENT '单位id',
PRIMARY KEY (`id`),
INDEX `FK_company_position_company` (`company_id`),
CONSTRAINT `FK_company_position_company` FOREIGN KEY (`company_id`) REFERENCES `company` (`id`) ON DELETE CASCADE
)
COMMENT='单位职位信息'
COLLATE='utf8_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `company_user` (
`company_id` INT(11) NOT NULL COMMENT '公司id',
`user_id` BIGINT(20) NOT NULL COMMENT '用户id',
`admin` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '公司管理员',
UNIQUE INDEX `user_id` (`user_id`),
INDEX `FK_company_user_company` (`company_id`),
CONSTRAINT `FK_company_user_company` FOREIGN KEY (`company_id`) REFERENCES `company` (`id`) ON DELETE CASCADE,
CONSTRAINT `FK_company_user_sys_user` FOREIGN KEY (`user_id`) REFERENCES `sys_user` (`id`) ON DELETE CASCADE
)
COMMENT='单位用户关系'
COLLATE='utf8_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `department_user` (
`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
`user_id` BIGINT(20) NOT NULL COMMENT '用户id',
`department_id` INT(11) NOT NULL COMMENT '部门id',
`position_id` INT(11) NULL DEFAULT NULL COMMENT '职位id',
`manager` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '部门管理员',
`create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
PRIMARY KEY (`id`),
INDEX `FK_department_user_company_position` (`position_id`),
INDEX `FK_department_user_sys_user` (`user_id`),
INDEX `FK_department_user_company_department` (`department_id`),
CONSTRAINT `FK_department_user_company_department` FOREIGN KEY (`department_id`) REFERENCES `company_department` (`id`) ON DELETE CASCADE,
CONSTRAINT `FK_department_user_company_position` FOREIGN KEY (`position_id`) REFERENCES `company_position` (`id`) ON DELETE SET NULL,
CONSTRAINT `FK_department_user_sys_user` FOREIGN KEY (`user_id`) REFERENCES `sys_user` (`id`) ON DELETE CASCADE
)
COMMENT='用户、部门关联表'
COLLATE='utf8_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `department_lesson` (
`lesson_id` BIGINT(20) NOT NULL COMMENT '课程id',
`department_id` INT(11) NOT NULL COMMENT '班级id',
INDEX `lesson_id` (`lesson_id`),
INDEX `department_lesson_ibfk_1` (`department_id`),
CONSTRAINT `department_lesson_ibfk_1` FOREIGN KEY (`department_id`) REFERENCES `company_department` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
CONSTRAINT `department_lesson_ibfk_2` FOREIGN KEY (`lesson_id`) REFERENCES `ls_lesson` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
)
COMMENT='班级课程表'
COLLATE='utf8_general_ci'
ENGINE=InnoDB
;
CREATE TABLE `department_exam` (
`exam_id` BIGINT(20) NOT NULL,
`department_id` INT(11) NOT NULL,
INDEX `exam_id` (`exam_id`),
INDEX `department_exam_ibfk_2` (`department_id`),
CONSTRAINT `department_exam_ibfk_1` FOREIGN KEY (`exam_id`) REFERENCES `exam_definition` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
CONSTRAINT `department_exam_ibfk_2` FOREIGN KEY (`department_id`) REFERENCES `company_department` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
)
COMMENT='学生的试卷和班级关系'
COLLATE='utf8_general_ci'
ENGINE=InnoDB
;
DROP TABLE `user_company_rel`;
ALTER TABLE `company`
ADD COLUMN `project_code` VARCHAR(64) NULL DEFAULT NULL COMMENT '关联项目' AFTER `phone`;

567
sql/20210112-dukang.sql Normal file
View File

@ -0,0 +1,567 @@
-- 创建贵装备单位
INSERT INTO `joylink`.`company` (`id`,`name`, `address`, `create_time`, `project_code`) VALUES ('6','贵州装备', '贵州', '2021-01-11 17:08:06', 'GZB');
-- 创建贵装备班级
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (14, '19城轨2班', 6);
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (9, '城轨1班', 6);
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (16, '19城轨机电2班', 6);
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (17, '19城轨机电1班', 6);
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (12, '18城市轨道交通机电技术2班', 6);
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (11, '18城市轨道交通机电技术1班', 6);
INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (13, '18城市轨道交通机电技术3班', 6);
-- 创建单位成员
INSERT INTO `company_user` (`company_id`, `user_id`, `admin`) VALUES (6, 620, 1);
INSERT INTO `company_user` (`company_id`, `user_id`, `admin`) VALUES (6, 628, 1);
INSERT INTO `company_user` (`company_id`, `user_id`, `admin`) VALUES (6, 630, 1);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 842);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 843);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 844);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 884);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 885);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 886);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 887);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 888);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 889);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 890);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 891);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 892);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 893);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 894);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 895);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 896);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 897);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 898);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 899);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 900);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 901);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 902);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 903);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 904);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 905);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 906);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 907);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 908);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 909);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 910);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 911);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 912);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 913);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 914);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 915);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 916);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 917);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 918);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 919);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 920);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 921);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 922);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 923);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 924);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 925);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 926);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 927);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 928);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 929);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 930);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 931);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 932);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 933);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 934);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 935);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 936);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 937);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 938);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 939);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 940);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 941);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 942);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 943);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 944);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 945);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 946);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 947);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 948);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 949);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 950);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 951);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 952);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 953);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 954);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 955);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 956);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 957);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 958);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 959);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 960);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 961);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 962);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 963);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 964);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 965);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 966);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 967);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 968);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 969);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 970);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 971);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 972);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 973);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 974);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 975);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 976);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 977);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 978);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 979);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 980);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 981);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 982);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 983);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 984);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 985);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 986);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 987);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 988);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 989);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 990);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 991);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 992);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 993);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 994);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 995);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 996);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 997);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 998);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 999);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1000);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1001);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1002);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1003);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1004);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1005);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1006);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1007);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1008);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1009);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1010);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1011);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1012);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1013);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1014);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1015);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1016);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1017);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2654);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2655);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2656);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2658);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2659);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2697);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2698);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2699);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2700);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2701);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2702);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2703);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2704);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2705);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2706);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2707);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2708);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2709);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2710);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2711);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2712);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2713);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2714);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2715);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2716);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2717);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2718);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2719);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2720);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2721);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2722);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2723);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2724);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2725);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2726);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2727);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2728);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2729);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2730);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2731);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2732);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2733);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2734);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2735);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2736);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2737);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2738);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2739);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2740);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2741);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2742);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2743);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2744);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2745);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2746);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2747);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2748);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3026);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3027);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3028);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3029);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3030);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3031);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3032);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3033);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3034);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3035);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3036);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3037);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3038);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3039);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3040);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3041);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3042);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3043);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3044);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3045);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3046);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3047);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3048);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3049);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3050);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3051);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3052);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3053);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3054);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3055);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3056);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3057);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3058);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3059);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3060);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3061);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3062);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3063);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3064);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3065);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3066);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3067);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3068);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3069);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3070);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3071);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3072);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3073);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3074);
INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3075);
-- 创建部门成员关系
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (9, 620, 1);
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (14, 620, 1);
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (16, 620, 1);
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (17, 628, 1);
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (11, 630, 1);
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (12, 630, 1);
INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (13, 630, 1);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (9, 842);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (9, 843);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (9, 844);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 884);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 885);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 886);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 887);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 888);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 889);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 890);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 891);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 892);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 893);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 894);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 895);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 896);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 897);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 898);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 899);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 900);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 901);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 902);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 903);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 904);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 905);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 906);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 907);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 908);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 909);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 910);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 911);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 912);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 913);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 914);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 915);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 916);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 917);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 918);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 919);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 920);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 921);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 922);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 923);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 924);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 925);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 926);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 927);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 928);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 929);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 930);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 931);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 932);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 933);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 934);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 935);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 936);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 937);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 938);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 939);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 940);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 941);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 942);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 943);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 944);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 945);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 946);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 947);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 948);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 949);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 950);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 951);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 952);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 953);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 954);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 955);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 956);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 957);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 958);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 959);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 960);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 961);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 962);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 963);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 964);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 965);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 966);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 967);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 968);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 969);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 970);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 971);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 972);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 973);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 974);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 975);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 976);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 977);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 978);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 979);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 980);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 981);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 982);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 983);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 984);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 985);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 986);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 987);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 988);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 989);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 990);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 991);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 992);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 993);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 994);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 995);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 996);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 997);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 998);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 999);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1000);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1001);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1002);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1003);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1004);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1005);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1006);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1007);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1008);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1009);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1010);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1011);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1012);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1013);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1014);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1015);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1016);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1017);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2654);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2655);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2656);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2658);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2659);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2697);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2698);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2699);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2700);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2701);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2702);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2703);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2704);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2705);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2706);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2707);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2708);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2709);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2710);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2711);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2712);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2713);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2714);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2715);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2716);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2717);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2718);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2719);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2720);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2721);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2722);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2723);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2724);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2725);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2726);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2727);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2728);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2729);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2730);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2731);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2732);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2733);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2734);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2735);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2736);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2737);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2738);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2739);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2740);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2741);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2742);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2743);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2744);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2745);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2746);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2747);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2748);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3026);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3027);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3028);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3029);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3030);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3031);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3032);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3033);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3034);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3035);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3036);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3037);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3038);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3039);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3040);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3041);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3042);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3043);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3044);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3045);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3046);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3047);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3048);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3049);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3050);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3051);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3052);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3053);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3054);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3055);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3056);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3057);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3058);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3059);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3060);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3061);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3062);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3063);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3064);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3065);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3066);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3067);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3068);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3069);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3070);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3071);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3072);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3073);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3074);
INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3075);
-- 部门课程关系
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (47, 11);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (48, 11);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (47, 12);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (48, 12);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (47, 13);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (48, 13);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (107, 14);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (109, 14);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (110, 14);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (111, 14);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (117, 14);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (115, 16);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (116, 16);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (118, 16);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (123, 16);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (126, 16);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (127, 16);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (119, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (122, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (128, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (129, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (130, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (131, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (132, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (133, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (134, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (135, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (136, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (137, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (138, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (139, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (140, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (141, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (143, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (144, 17);
INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (145, 17);
-- 部门考试关系
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (172, 16);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (173, 16);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (174, 16);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (177, 16);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (178, 16);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (179, 17);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (180, 17);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (181, 17);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (182, 17);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (183, 17);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (186, 17);
INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (187, 17);

4
sql/20210113-shengxuqiang.sql Normal file
View File

@ -0,0 +1,4 @@
ALTER TABLE `draft_map_route_flank_protection`
DROP COLUMN `station_code`,
DROP COLUMN `number`;

3
sql/20210128-zhangsai.sql Normal file
View File

@ -0,0 +1,3 @@
alter table sale_order
add transaction_id varchar(32) null comment '支付平台订单号';

9
sql/20210303-zhangsai.sql Normal file
View File

@ -0,0 +1,9 @@
alter table learn_comment
add user_name varchar(32) null comment '给成都工业临时加的';
alter table learn_message
add user_name varchar(32) null comment '给成都工业临时加的';
alter table learn_message modify creator_id bigint null comment '留言者';
alter table learn_comment modify creator_id bigint null comment '创建者';

43
sql/20210312-zhangsai.sql Normal file
View File

@ -0,0 +1,43 @@
-- auto-generated definition
create table cgy_record
(
id int not null
primary key,
browse_count int null comment '浏览次数',
download_count int null comment '百度网盘链接打开次数'
)
comment '成都工业项目使用记录';
-- 课程表删city_code
alter table ls_lesson drop column city_code;
-- 组织表添加字段
alter table org
add creator_id bigint not null comment '创建者';
alter table org
add create_time datetime default current_timestamp not null comment '创建时间';
alter table org
add update_id bigint null comment '更新者';
alter table org
add update_time datetime null comment '更新时间';
-- 添加组织评价规则表
CREATE TABLE `org_scoring_rule` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`org_id` int(11) NOT NULL COMMENT '组织（班级）id',
`school_year` varchar(16) NOT NULL COMMENT '学年',
`term` int(1) NOT NULL COMMENT '学期',
`usual_scoring_rule` text COMMENT '平时分评分规则',
`final_scoring_rule` text COMMENT '期末分评分规则',
`creator_id` bigint(20) NOT NULL COMMENT '创建人id',
`create_time` datetime NOT NULL COMMENT '创建时间',
`update_id` bigint(20) DEFAULT NULL COMMENT '更新者id',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='组织评分规则';

12
sql/20210315-sheng-project-server.sql Normal file
View File

@ -0,0 +1,12 @@
DROP TABLE IF EXISTS `project_server`;
CREATE TABLE `project_server` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`project` varchar(32) NOT NULL COMMENT '项目编码',
`domain_name` varchar(255) NOT NULL COMMENT '域名',
`create_user_id` bigint(20) NOT NULL,
`create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
`update_user_id` bigint(20) DEFAULT NULL,
`update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `project_server_project_1` (`project`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='项目服务器域名表';

15
sql/20210322-zhangsai.sql Normal file
View File

@ -0,0 +1,15 @@
-- 评价规则表添加字段
alter table org_scoring_rule
add `name` varchar(64) not null comment '名称' after id;
-- 创建表
create table org_scoring_rule_rel
(
org_id int not null,
rule_id bigint not null
)
comment '班级与评价规则关联表';
-- 组织表添加字段
alter table org
add status varchar(1) not null comment '状态';

59
sql/20210324-zhangsai.sql Normal file
View File

@ -0,0 +1,59 @@
alter table org_lesson
add creator_id bigint not null comment '创建人id',
add create_time datetime default current_timestamp not null comment '创建时间';
-- 删除外键
alter table org drop foreign key FK_company_department_company_department1;
alter table org_lesson drop foreign key org_lesson_ibfk_1;
alter table org_lesson drop foreign key org_lesson_ibfk_2;
alter table org_user drop foreign key FK_department_user_company_department1;
alter table org_user drop foreign key FK_department_user_sys_use1r;
alter table org_exam drop foreign key org_exam_ibfk_1;
alter table org_exam drop foreign key org_exam_ibfk_2;
-- 修改id数据类型
alter table org modify id bigint auto_increment;
alter table org modify parent_id bigint null comment '父级id';
alter table org modify root_id bigint null comment '单位id';
alter table race_question_progress modify company_id bigint null;
alter table race_result modify company_id bigint null comment '公司id';
alter table race_question modify company_id bigint null comment '公司题库';
alter table race_questions_rules modify company_id bigint null;
alter table org_scoring_rule_rel modify org_id bigint not null;
alter table org_lesson modify org_id bigint not null comment '班级id';
alter table org_scoring_rule modify org_id bigint not null comment '该规则属于哪个顶级组织';
alter table org_user modify org_id bigint not null comment '部门id';
-- 添加字段
alter table org_scoring_rule_rel
add rule_org_id bigint not null comment '规则关联的顶级组织id',
add rule_school_year varchar(16) not null comment '规则所属学年',
add rule_term int(1) not null comment '规则所属学期',
add rule_creator_id bigint not null comment '创建者id';

26
sql/20210326-zhangsai.sql Normal file
View File

@ -0,0 +1,26 @@
alter table exam_definition modify lesson_id bigint null comment '所属课程ID',
add map_id bigint not null comment '地图id' after id;
-- 更新exam_definition的map_id字段
UPDATE exam_definition SET map_id =( SELECT map_id FROM ls_lesson WHERE exam_definition.lesson_id = ls_lesson.id);
-- 更新exam_definition的type字段
UPDATE exam_definition SET type =( SELECT prd_type FROM ls_lesson WHERE exam_definition.lesson_id = ls_lesson.id);
alter table org_exam
modify org_id bigint not null,
add creator_id bigint not null,
add create_time datetime not null;
ALTER TABLE `org_exam`
ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT FIRST ,
ADD PRIMARY KEY (`id`);
-- org_lesson表添加主键
ALTER TABLE `org_lesson`
ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT FIRST ,
ADD PRIMARY KEY (`id`);

2
sql/20210401-zhangsai.sql Normal file
View File

@ -0,0 +1,2 @@
alter table sys_user
add org_id bigint null comment '所属组织id' after account;

12
src/main/java/club/joylink/rtss/configuration/WebConfig.java
View File

@ -48,6 +48,18 @@ public class WebConfig implements WebMvcConfigurer {
whiteList.add("/api/rpTools/**");
whiteList.add("/api/license/validate");
whiteList.add("/api/license/local");
// 微信回调接口
whiteList.add("/api/wechatPay/receive");
// 成都工业留言板
whiteList.add("/api/learn/cgy/message/create");
whiteList.add("/api/learn/cgy/{messageId}/comment");
whiteList.add("/api/learn/{postId}/message/pagedQuery/postId");
whiteList.add("GET /api/learn/{messageId}/comment");
whiteList.add("/api/learn/cgy/updateMessageTime");
// 成都工业使用记录
whiteList.add("/api/cgy/**");
//项目域名查询
whiteList.add("/api/projectServer/project/{project}");
registry.addInterceptor(authenticateInterceptor).excludePathPatterns(whiteList);
}

23
src/main/java/club/joylink/rtss/constants/BusinessConsts.java
View File

@ -1,7 +1,5 @@
package club.joylink.rtss.constants;
import club.joylink.rtss.simulation.cbtc.data.map.Switch;
public interface BusinessConsts {
String Default_NationCode = "86";
@ -599,6 +597,11 @@ public interface BusinessConsts {
* 道岔计轴区段
*/
String Type04 = "04";
/**
* 岔心
*/
String Type05 = "05";
}
}
@ -781,4 +784,20 @@ public interface BusinessConsts {
*/
answer
}
/**组织角色枚举*/
enum OrgRole {
Admin,Teacher, Student
}
interface Org{
interface Status {
String DELETE = "0";
String VALID = "1";
}
}
enum MapGroupType{
DATA,RUNPLAN;
}
}

2
src/main/java/club/joylink/rtss/constants/Client.java
View File

@ -43,6 +43,6 @@ public enum Client {
return value;
}
}
throw BusinessExceptionAssertEnum.INVALID_CLIENT.exception("未找到id为[%s]的客户端");
throw BusinessExceptionAssertEnum.INVALID_CLIENT.exception(String.format("未找到id为[%s]的客户端",clientId));
}
}

9
src/main/java/club/joylink/rtss/constants/Depart.java Normal file
View File

@ -0,0 +1,9 @@
package club.joylink.rtss.constants;
import lombok.Getter;
public interface Depart{
}

1
src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java
View File

@ -11,6 +11,7 @@ public enum MapPrdTypeEnum {
SCHEDULING("05", "派班工作站"),
ISCS("06", "ISCS工作站"),
BIG_SCREEN("07", "大屏工作站"),
RUN_PLAN_MAKE("08", "运行图编制工作站")
;
private String code;

2
src/main/java/club/joylink/rtss/constants/Project.java
View File

@ -26,6 +26,8 @@ public enum Project {
DRTS,
/** 北京交通大学项目（客流量科研） */
BJD,
/** 成都工业职业技术学院 */
CGY,
;
public static boolean isDefault(Project project) {

3
src/main/java/club/joylink/rtss/constants/SaleOrderPayWaysEnum.java
View File

@ -1,5 +1,8 @@
package club.joylink.rtss.constants;
import lombok.Getter;
@Getter
public enum SaleOrderPayWaysEnum {
Offline("01", "线下"),
Alipay("02", "支付宝"),

34
src/main/java/club/joylink/rtss/controller/CGYController.java Normal file
View File

@ -0,0 +1,34 @@
package club.joylink.rtss.controller;
import club.joylink.rtss.services.CgyRecordService;
import club.joylink.rtss.vo.client.CgyRecordVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 成都工业
*/
@RestController
@RequestMapping("/api/cgy")
public class CGYController {
@Autowired
private CgyRecordService cgyRecordService;
@GetMapping("/record")
public CgyRecordVO getBrowseCount() {
return cgyRecordService.getRecord();
}
@PutMapping("/browse")
public void browseCount() {
cgyRecordService.browseCount();
}
@PutMapping("/download")
public void downloadCount() {
cgyRecordService.downloadCount();
}
}

78
src/main/java/club/joylink/rtss/controller/CompanyController.java
View File

@ -1,78 +0,0 @@
package club.joylink.rtss.controller;
import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.services.ICompanyService;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.CompanyQueryVO;
import club.joylink.rtss.vo.client.CompanyVO;
import club.joylink.rtss.vo.client.PageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@Api(tags = {"公司单位管理接口"})
@RestController
@RequestMapping("/api/company")
public class CompanyController {
@Autowired
private ICompanyService iCompanyService;
@ApiOperation(value = "添加公司信息")
@PostMapping
public CompanyVO create(@RequestBody @Validated CompanyVO company) {
CompanyVO vo = this.iCompanyService.create(company);
return vo;
}
@ApiOperation(value = "获取公司列表")
@GetMapping
public List<CompanyVO> queryAll() {
List<CompanyVO> list = this.iCompanyService.queryOrganizations();
return list;
}
@ApiOperation(value = "分页获取公司列表")
@GetMapping("paging")
public PageVO<CompanyVO> pagingQueryAll(CompanyQueryVO queryVO) {
PageVO<CompanyVO> list = this.iCompanyService.queryPageOrganizations(queryVO);
return list;
}
@ApiOperation(value = "删除公司信息")
@DeleteMapping("{id}")
public void delete( @PathVariable Integer id) {
this.iCompanyService.deleteCompanyById(id);
}
@ApiOperation(value = "查询公司信息")
@GetMapping("{id}")
public CompanyVO get( @PathVariable Integer id) {
return this.iCompanyService.getCompanyById(id);
}
@ApiOperation(value = "更新公司信息")
@PutMapping("{id}")
public CompanyVO updateCompany(@PathVariable Integer id, @RequestBody @Validated CompanyVO company) {
return this.iCompanyService.updateCompany(id, company);
}
@Role({RoleEnum.Admin, RoleEnum.SuperAdmin})
@ApiOperation("添加公司管理者")
@PutMapping("/{companyId}/addManager")
public void addManager(@PathVariable Integer companyId, @RequestBody List<Long> userIds, @RequestAttribute @ApiIgnore UserVO user) {
iCompanyService.addManager(companyId, userIds, user);
}
@ApiOperation(value = "微信小程用户绑定单位")
@PutMapping(path = "/bind/company")
public void userBindCompany(Long userId, Integer companyId) {
this.iCompanyService.userBindCompany(userId, companyId);
}
}

32
src/main/java/club/joylink/rtss/controller/LearnController.java
View File

@ -91,6 +91,12 @@ public class LearnController {
return iLearnService.createMessage(messageCreateVO, user);
}
@ApiOperation("成工院留言")
@PostMapping("/cgy/message/create")
public long cgyCreateMessage(@RequestBody @Validated LearnMessageCreateVO messageCreateVO) {
return iLearnService.cgyCreateMessage(messageCreateVO);
}
@ApiOperation("分页查询留言")
@GetMapping("/{postId}/message/pagedQuery/postId")
public PageVO<LearnMessageVO> pagedQueryMessageByPostId(@PathVariable Long postId, LearnMessagePagedQueryVO queryVO) {
@ -149,6 +155,13 @@ public class LearnController {
iLearnService.addComment(messageId, commentCreateVO, user);
}
@ApiOperation(value = "成工院评论")
@PostMapping(path = "/cgy/{messageId}/comment")
public void cygComment(@PathVariable Long messageId,
@RequestBody @Validated(value = LearnCommentCreateCheck.class) LearnCreateVO commentCreateVO) {
iLearnService.cgyAddComment(messageId, commentCreateVO);
}
@ApiOperation(value = "回复")
@PostMapping(path = "/{messageId}/{commentId}/comment")
public void comment(@PathVariable Long messageId, @PathVariable Long commentId,
@ -187,4 +200,23 @@ public class LearnController {
iLearnService.userDeleteComment(commentId, user);
}
//----------------------------------------- 改数据 -----------------------------------------
@ApiOperation(value = "管理员修改留言数据")
@PutMapping(path = "/admin/update/message")
public void adminUpdateMessage(LearnMessageUpdateVO messageUpdateVO) {
iLearnService.adminUpdateMessage(messageUpdateVO);
}
@ApiOperation(value = "管理员修改评论数据")
@PutMapping(path = "/admin/update/comment")
public void adminUpdateComment(LearnCommentUpdateVO commentUpdateVO) {
iLearnService.adminUpdateComment(commentUpdateVO);
}
@ApiOperation(value = "成工院留言时间打散")
@PutMapping(path = "/cgy/updateMessageTime")
public void cgyUpdateMessageTime() {
iLearnService.cgyUpdateMessageTime();
}
}

8
src/main/java/club/joylink/rtss/controller/OperateController.java
View File

@ -1,7 +1,13 @@
package club.joylink.rtss.controller;
import club.joylink.rtss.services.IOperateService;
import club.joylink.rtss.vo.client.*;
import club.joylink.rtss.vo.client.PageQueryVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.TreeNode;
import club.joylink.rtss.vo.client.training.definition.OperateDefinitionQueryVO;
import club.joylink.rtss.vo.client.training.definition.OperateDefinitionVO;
import club.joylink.rtss.vo.client.training.definition.OperatePlaceholderVO;
import club.joylink.rtss.vo.client.training.definition.OperateStepVO;
import club.joylink.rtss.vo.client.validGroup.OperateBatchCreateCheck;
import club.joylink.rtss.vo.client.validGroup.OperateSignleCreateCheck;
import club.joylink.rtss.vo.client.validGroup.ValidList;

338
src/main/java/club/joylink/rtss/controller/OrgController.java Normal file
View File

@ -0,0 +1,338 @@
package club.joylink.rtss.controller;
import club.joylink.rtss.constants.BusinessConsts;
import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.dao.OrgDAO;
import club.joylink.rtss.dao.OrgUserDAO;
import club.joylink.rtss.dao.SysUserDAO;
import club.joylink.rtss.entity.Org;
import club.joylink.rtss.entity.OrgUser;
import club.joylink.rtss.entity.OrgUserExample;
import club.joylink.rtss.entity.SysUser;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.services.org.*;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.LessonVO;
import club.joylink.rtss.vo.client.Node;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.org.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.constraints.NotBlank;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Api(tags = {"组织成员管理接口"})
@RestController
@RequestMapping("/api/company")
public class OrgController {
@Autowired
private IOrgUserService iOrgUserService;
@Autowired
private IOrgLessonService iOrgLessonService;
@Autowired
private IOrgService iOrgService;
@Autowired
private IOrgScoringRuleService iOrgScoringRuleService;
@Autowired
private IOrgExamService iOrgExamService;
@Autowired
private ISysUserService iSysUserService;
@Autowired
private SysUserDAO sysUserDAO;
@Autowired
private OrgUserDAO orgUserDAO;
@Autowired
private OrgDAO orgDAO;
@ApiOperation(value = "创建顶级组织")
@PostMapping
public CompanyVO create(@RequestBody @Validated CompanyVO company, @RequestAttribute(AuthenticateInterceptor.LOGIN_USER_KEY) UserVO user) {
return iOrgService.createTopOrg(company, user);
}
@ApiOperation(value = "获取公司列表")
@GetMapping
public List<CompanyVO> queryAll() {
return iOrgService.queryAllTopOrg();
}
@ApiOperation(value = "分页获取公司列表")
@GetMapping("paging")
public PageVO<CompanyVO> pagingQueryAll(OrgQueryVO queryVO) {
return iOrgService.pagedQueryAllTopOrg(queryVO);
}
@ApiOperation(value = "查询公司信息")
@GetMapping("{id}")
public CompanyVO get(@PathVariable Long id) {
return iOrgService.get(id);
}
@ApiOperation(value = "更新公司信息")
@PutMapping("{id}")
public CompanyVO updateCompany(@PathVariable Long id, @RequestBody @Validated CompanyVO company, @RequestAttribute UserVO user) {
return iOrgService.updateOrg(id, company, user);
}
@ApiOperation(value = "微信小程用户绑定为单位管理员")
@PutMapping(path = "/bind/company")
public CompanyVO userScanCodeBindCompany(Long userId, Long companyId) {
return iOrgUserService.userScanCodeBindCompanyManager(userId, companyId);
}
@ApiOperation(value = "添加部门信息")
@PostMapping(path = "/dept")
public DepartmentVO createDepart(@RequestBody @Validated DepartmentVO departmentVO) {
return iOrgUserService.createDepart(departmentVO);
}
@ApiOperation(value = "获取单位所有部门")
@GetMapping(path = "{companyId}/dept")
public List<DepartmentVO> queryCompanyDepart(@PathVariable Long companyId) {
return iOrgUserService.getCompanyAllDepart(companyId);
}
@ApiOperation(value = "获取部门及其子树")
@GetMapping(path = "{companyId}/dept/{deptId}/tree")
public DepartmentVO queryDepartTree(@PathVariable Long deptId, @PathVariable Long companyId) {
return iOrgUserService.getDepartTree(companyId, deptId);
}
@ApiOperation(value = "获取部门及其子部门")
@GetMapping(path = "{companyId}/dept/{deptId}")
public List<DepartmentVO> queryDepart(@PathVariable Long deptId, @PathVariable Long companyId) {
return iOrgUserService.getDepartAndChild(companyId, deptId);
}
@ApiOperation(value = "删除部门信息")
@DeleteMapping("/dept/{deptId}")
public void deleteDepart(@PathVariable Long deptId) {
iOrgService.deleteNonTopOrg(deptId);
}
@ApiOperation(value = "查询部门信息")
@GetMapping("/dept/{deptId}")
public DepartmentVO getDepart(@PathVariable Long deptId) {
return iOrgUserService.getDepartById(deptId);
}
@ApiOperation(value = "更新部门信息")
@PutMapping("/dept/{id}")
public void updateDepartInfo(@PathVariable Long id, @RequestBody @Validated DepartmentVO departmentVO) {
iOrgUserService.updateDepartInfo(id, departmentVO);
}
@ApiOperation(value = "添加单位成员关系信息")
@PostMapping("refUserInfo")
public void addCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @RequestBody UserDepartRelVO userDepartRelVO) {
iOrgUserService.addDepartUserInfo(user, userDepartRelVO);
}
@ApiOperation(value = "更新单位成员关系信息")
@PutMapping("refUserInfo")
public void updateCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @RequestBody UserDepartRelVO userDepartRelVO) {
iOrgUserService.updateDepartUserInfo(user, userDepartRelVO);
}
@ApiOperation(value = "取消单位的部门成员关系")
@DeleteMapping("departUserInfo")
public void deleteCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @RequestBody @Validated UserDepartRelVO userDepartRelVO) {
iOrgUserService.deleteDepartUserInfo(user, userDepartRelVO);
}
@ApiOperation(value = "分页获取班级学生信息")
@GetMapping("/dept/{clsId}/departUserInfo")
public PageVO<OrgUserVO> getCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @PathVariable Integer clsId, CompanyUserQueryVO companyUserQueryVO) {
return iOrgUserService.getCompanyDepartUserInfoList(user, clsId, companyUserQueryVO);
}
@ApiOperation(value = "导入单位成员信息")
@PostMapping("{clsId}/departUserInfo/import")
public void importCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @PathVariable Long clsId, @RequestBody List<ImportOrgUserVO> importOrgUsers) {
iOrgUserService.importCompanyUserInfo(user, clsId, importOrgUsers);
}
@ApiOperation(value = "获取单位用户的部门信息")
@GetMapping("{companyId}/userDeparts")
public List<OrgUserVO> getUserCompanyDeparts(@RequestAttribute @ApiIgnore UserVO user, @PathVariable Integer companyId) {
return iOrgUserService.getUserCompanyDeparts(user, companyId);
}
@ApiOperation("查询自己给该组织（班级）排的课")
@GetMapping("/orgLesson/{orgId}/list")
public List<LessonVO> queryOrgLessonICreated(@PathVariable Long orgId, @RequestAttribute UserVO user) {
return iOrgLessonService.queryOrgLessonICreated(orgId, user);
}
@ApiOperation("修改班级-课程关系")
@PutMapping("/orgLesson/{clsId}/update")
public void updateOrgLesson(@PathVariable Long clsId, @RequestBody List<Long> lessonIds, @RequestAttribute LoginUserInfoVO loginInfo) {
iOrgLessonService.updateOrgLesson(clsId, lessonIds, loginInfo);
}
@ApiOperation("给班级添加学生")
@PostMapping("/orgUser/{clsId}/addStudent")
public void addStudent(@PathVariable Long clsId, @RequestBody ImportOrgUserVO importVO, @RequestAttribute UserVO user) {
iOrgUserService.addStudent(clsId, importVO, user);
}
@ApiOperation("创建班级")
@PostMapping("/org/cls/create")
public void createCls(@RequestBody NonTopOrgCreateVO createVO, @RequestAttribute LoginUserInfoVO loginInfo) {
iOrgService.createCls(createVO, loginInfo);
}
@ApiOperation("分页查询当前登录项目所属组织下的班级")
@GetMapping("/paged/cls")
public PageVO<DepartmentVO> pagedQuerySelfCls(OrgQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) {
return iOrgService.pagedQueryCls(queryVO, loginInfo);
}
@ApiOperation("查询当前登录项目所属组织下的班级")
@GetMapping("/list/cls")
public List<DepartmentVO> queryCls(OrgQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) {
return iOrgService.queryCls(queryVO, loginInfo);
}
@ApiOperation("创建评价规则")
@PostMapping("/orgScoringRule")
public void createScoringRule(@RequestBody OrgScoringRuleVO orgScoringRuleVO, @RequestAttribute LoginUserInfoVO loginInfo) {
iOrgScoringRuleService.createScoringRule(orgScoringRuleVO, loginInfo);
}
@ApiOperation("更新评价规则")
@PutMapping("/orgScoringRule")
public void UpdateScoringRule(@RequestBody OrgScoringRuleVO orgScoringRuleVO, @RequestAttribute UserVO user) {
iOrgScoringRuleService.updateScoringRule(orgScoringRuleVO, user);
}
@ApiOperation("查询自己创建的评价规则基础信息")
@GetMapping("/orgScoringRule/basicInfo/self/paged")
public PageVO<OrgScoringRuleVO> queryOrgScoringRuleBasicInfo(OrgScoringRuleQueryVO queryVO, @RequestAttribute UserVO user) {
return iOrgScoringRuleService.queryBasicInfo(queryVO, user);
}
@ApiOperation("查询自己创建的指定评价规则详细信息")
@GetMapping("/orgScoringRule/details/self/{orgId}/{schoolYear}/{term}")
public OrgScoringRuleVO queryOrgScoringRuleDetails(@PathVariable Long orgId, @PathVariable String schoolYear,
@PathVariable Integer term, @RequestAttribute LoginUserInfoVO loginInfo) {
return iOrgScoringRuleService.queryOrgScoringRuleDetails(orgId, schoolYear, term, loginInfo);
}
@ApiOperation("查询指定评价规则详细信息")
@GetMapping("/orgScoringRule/details/self/{ruleId}")
public OrgScoringRuleVO queryOrgScoringRuleDetails(@PathVariable Long ruleId) {
return iOrgScoringRuleService.getOrgScoringRuleDetails(ruleId);
}
@ApiOperation("获取评价规则的评分结果")
@GetMapping("/orgScoringRule/score/{orgId}/{schoolYear}/{term}")
public List<OrgScoringResultVO> score(@PathVariable Long orgId, @PathVariable String schoolYear,
@PathVariable Integer term, @RequestAttribute LoginUserInfoVO loginInfo) {
return iOrgScoringRuleService.score(orgId, schoolYear, term, loginInfo);
}
@ApiOperation("删除评分规则")
@DeleteMapping("/orgScoringRule/details/self/{ruleId}")
public void deleteScoringRule(@PathVariable Long ruleId, @RequestAttribute UserVO user) {
iOrgScoringRuleService.deleteRuleOfSelf(ruleId, user.getId());
}
@ApiOperation("查询规则能够应用到的组织")
@GetMapping("/orgScoringRule/{ruleId}/canApplyTo")
public List<DepartmentVO> queryRuleCanApplyTo(@PathVariable Long ruleId, @RequestAttribute UserVO user) {
return iOrgScoringRuleService.queryRuleCanApplyTo(ruleId, user);
}
@ApiOperation("将评价规则应用到")
@PostMapping("/orgScoringRule/{ruleId}/apply")
public void applyOrgScoringRule(@PathVariable Long ruleId, @RequestBody List<Long> orgIds) {
iOrgScoringRuleService.applyOrgScoringRule(ruleId, orgIds);
}
@ApiOperation("给班级安排考试")
@PostMapping("/orgExam/{clsId}")
public void createOrgExam(@PathVariable Long clsId, @RequestBody List<Long> examIds, @RequestAttribute UserVO user) {
iOrgExamService.create(clsId, examIds, user);
}
@ApiOperation("查询班级安排的考试id")
@GetMapping("/orgExam/{clsId}/list")
public List<String> queryOrgExam(@PathVariable Long clsId, @RequestAttribute UserVO user) {
return iOrgExamService.queryOrgExam(clsId, user);
}
@Role(RoleEnum.Admin)
@ApiOperation("管理员查看组织树")
@GetMapping("/orgTree/{orgId}")
public Node<Object> adminQueryOrgTree(@PathVariable Long orgId, @RequestAttribute UserVO user) {
return iOrgService.adminQueryOrgTree(orgId);
}
@Transactional
@ApiOperation("数据处理接口，用后即删")
@PutMapping("/data/data")
public void data() {
OrgUserExample orgUserExample = new OrgUserExample();
orgUserExample.createCriteria().andRoleEqualTo(BusinessConsts.OrgRole.Student.name());
List<OrgUser> ous = orgUserDAO.selectByExample(orgUserExample);
Set<Long> orgIdSet = new HashSet<>();
Map<Long, Set<Long>> userId_orgIdSet_map = new HashMap<>();
ous.forEach(ou -> {
orgIdSet.add(ou.getOrgId());
Set<Long> userOrgIdSet = userId_orgIdSet_map.computeIfAbsent(ou.getUserId(), k -> new HashSet<>());
userOrgIdSet.add(ou.getOrgId());
});
List<Org> orgList = iOrgService.findEntities(new ArrayList<>(orgIdSet), null);
Map<Long, Long> orgId_rootId_map = orgList.stream().collect(Collectors.toMap(Org::getId, Org::getRootId));
Map<Long, Org> topOrgMap = iOrgService.findEntities(new ArrayList<>(orgId_rootId_map.values()), null)
.stream().collect(Collectors.toMap(Org::getId, Function.identity()));
List<SysUser> users = iSysUserService.findEntities(new ArrayList<>(userId_orgIdSet_map.keySet()), null);
Set<Long> nonRootOrgIds = new HashSet<>();
users.forEach(user -> {
Set<Long> userOrgIdSet = userId_orgIdSet_map.get(user.getId());
String orgCode = null;
Long rootId = null;
for (Long orgId : userOrgIdSet) {
rootId = orgId_rootId_map.get(orgId);
if (rootId == null) {
nonRootOrgIds.add(rootId);
} else {
Org org = topOrgMap.get(rootId);
if (orgCode == null) {
orgCode = org.getCode();
} else {
BusinessExceptionAssertEnum.DATA_ERROR.assertEquals(orgCode, org.getCode(), userOrgIdSet.toString());
}
}
}
BusinessExceptionAssertEnum.DATA_ERROR.assertNotNull(orgCode, user.getId() + "无所属顶级组织");
user.setAccount(user.getAccount().substring(0, user.getAccount().indexOf(orgCode)));
user.setOrgId(rootId);
sysUserDAO.updateByPrimaryKey(user);
});
System.out.println(nonRootOrgIds.toString());
}
}

52
src/main/java/club/joylink/rtss/controller/PassengerFlowParamController.java Normal file
View File

@ -0,0 +1,52 @@
package club.joylink.rtss.controller;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.services.pfp.PfpService;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.pfp.PfpVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 客流车站参数管理接口
*/
@RestController
@RequestMapping("/api/pfp")
public class PassengerFlowParamController {
@Autowired
private PfpService pfpService;
@GetMapping(path = "/list")
public List<PfpVO> queryList(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY)
UserVO userVO) {
List<PfpVO> list = this.pfpService.queryEntityList(userVO);
return list;
}
@GetMapping(path = "/{id}")
public PfpVO getById(@PathVariable Long id) {
PfpVO param = this.pfpService.getById(id);
return param;
}
@PostMapping(path = "")
public String create(@RequestBody PfpVO param,
@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY)
UserVO userVO) {
String id = this.pfpService.create(param, userVO);
return id;
}
@PutMapping(path = "/{id}")
public void update(@PathVariable Long id, @RequestBody PfpVO param) {
this.pfpService.update(id, param);
}
@DeleteMapping(path = "/{id}")
public void delete(@PathVariable Long id) {
this.pfpService.delete(id);
}
}

50
src/main/java/club/joylink/rtss/controller/ProjectServerController.java Normal file
View File

@ -0,0 +1,50 @@
package club.joylink.rtss.controller;
import club.joylink.rtss.constants.Project;
import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.services.project.ServerService;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.project.ProjectServerQueryVO;
import club.joylink.rtss.vo.project.ProjectServerVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping("/api/projectServer")
public class ProjectServerController {
@Autowired
private ServerService serverService;
@GetMapping("/project/{project}")
public ProjectServerVO getByProject(@PathVariable Project project) {
return this.serverService.getByProject(project);
}
@Role(RoleEnum.SuperAdmin)
@GetMapping("/paging")
public PageVO<ProjectServerVO> pagingQuery(ProjectServerQueryVO queryVO) {
return this.serverService.pagingQuery(queryVO);
}
@Role(RoleEnum.SuperAdmin)
@PostMapping("")
public String create(@RequestBody ProjectServerVO vo,
@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO) {
return this.serverService.create(vo, userVO);
}
@Role(RoleEnum.SuperAdmin)
@PutMapping("/{id}")
public void update(@PathVariable Long id,
@RequestBody ProjectServerVO vo,
@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO) {
this.serverService.update(id, vo, userVO);
}
}

13
src/main/java/club/joylink/rtss/controller/advice/CommonResponseBody.java
View File

@ -1,6 +1,7 @@
package club.joylink.rtss.controller.advice;
import club.joylink.rtss.exception.BusinessException;
import club.joylink.rtss.exception.PayException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.vo.CommonJsonResponse;
import club.joylink.rtss.vo.ResponseConsts;
@ -15,6 +16,7 @@ import org.springframework.web.bind.MissingServletRequestParameterException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
import java.util.List;
@ -50,7 +52,14 @@ public class CommonResponseBody implements ResponseBodyAdvice {
return commonJsonResponse;
}
@ExceptionHandler(Exception.class)
@ExceptionHandler({PayException.class})
@ResponseStatus
public CommonJsonResponse handleException(PayException e) {
log.error("【支付异常】", e);
return CommonJsonResponse.newErrorResponse();
}
@ExceptionHandler({Exception.class})
@ResponseBody
public CommonJsonResponse handleException(Exception e) {
if(e instanceof MethodArgumentNotValidException) {
@ -59,7 +68,7 @@ public class CommonResponseBody implements ResponseBodyAdvice {
List<ObjectError> errorList = validException.getBindingResult().getAllErrors();
StringBuffer sb = new StringBuffer();
errorList.forEach(error ->
sb.append(error.getCodes()[0]).append(" : ").append(error.getDefaultMessage()).append("; "));
sb.append(error.getDefaultMessage()).append(";"));
log.error("【参数校验异常】{}", e);
return CommonJsonResponse.newErrorResponse(ResponseConsts.VALIDATE_ERROR.getCode(), sb.toString());
} if(e instanceof BusinessException) {

5
src/main/java/club/joylink/rtss/controller/competition/CompetitionPracticalController.java
View File

@ -11,6 +11,7 @@ import club.joylink.rtss.vo.client.competition.CompetitionPagedQueryVO;
import club.joylink.rtss.vo.client.competition.CompetitionResult;
import club.joylink.rtss.vo.client.competition.CompetitionVO;
import club.joylink.rtss.vo.client.competition.OperationStatisticVO;
import club.joylink.rtss.vo.client.pay.WxPayUnifiedOrderResultVO;
import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
import club.joylink.rtss.vo.client.validGroup.competition.CompetitionUpdateCheck;
import club.joylink.rtss.vo.view.OperationStatisticAnswerView;
@ -97,8 +98,8 @@ public class CompetitionPracticalController {
@ApiOperation("购买权限")
@PostMapping("/purchasePermission")
public String purchasePermission(Long mapId, Long amount, @RequestAttribute UserVO user) {
return iCompetitionPracticalService.purchasePermission(mapId, amount, user);
public WxPayUnifiedOrderResultVO purchasePermission(Long mapId, Integer monthAmount, @RequestAttribute UserVO user) {
return iCompetitionPracticalService.purchasePermission(mapId, monthAmount, user);
}
/* ------------------------- 竞赛运行相关 ------------------------- */

4
src/main/java/club/joylink/rtss/controller/competition/RaceTheoryController.java
View File

@ -47,7 +47,7 @@ public class RaceTheoryController {
@ApiOperation(value = "清除理论考试结果")
@DeleteMapping(path = "/project/{projectCode}")
@Role(RoleEnum.SuperAdmin)
public void submitProjectTheory(@PathVariable String projectCode, @RequestParam(required = false) Integer companyId) {
public void submitProjectTheory(@PathVariable String projectCode, @RequestParam(required = false) Long companyId) {
iRaceTheoryService.deleteRaceTheoryResult(projectCode, companyId);
}
@ -56,7 +56,7 @@ public class RaceTheoryController {
*/
@ApiOperation(value = "评分员获取考生理论考试结果详情")
@GetMapping(path = "/project/{projectCode}/result/detail")
public List<RaceResultDetailVO> getTheoryAnswerDetails(@PathVariable String projectCode, @RequestParam(required = false) Integer companyId, Long id) {
public List<RaceResultDetailVO> getTheoryAnswerDetails(@PathVariable String projectCode, @RequestParam(required = false) Long companyId, Long id) {
return iRaceTheoryService.getTheoryResultDetails(projectCode, companyId, id);
}
}

6
src/main/java/club/joylink/rtss/controller/competition/question/QuestionBankController.java
View File

@ -59,7 +59,7 @@ public class QuestionBankController {
@ApiOperation(value = "导入项目或单位试题库")
@PostMapping(path = "/questions/import")
public void importProjectQuestion(@Validated @RequestBody List<QuestionVO> questions,@RequestAttribute LoginUserInfoVO loginInfo,
@ApiIgnore @RequestAttribute UserVO user, @RequestParam(required = false, name = "id") Integer companyId) {
@ApiIgnore @RequestAttribute UserVO user, @RequestParam(required = false, name = "id") Long companyId) {
iQuestionBankService.importProjectQuestion(questions, loginInfo.getProject().name(), companyId,user);
}
@ -85,14 +85,14 @@ public class QuestionBankController {
@ApiOperation(value = "根据题型获取题目数量")
@GetMapping(path = "/number")
public Integer getNumberUnderKnowledgeAndType(@RequestAttribute LoginUserInfoVO loginInfo, String type, Integer companyId) {
public Integer getNumberUnderKnowledgeAndType(@RequestAttribute LoginUserInfoVO loginInfo, String type, Long companyId) {
return iQuestionBankService.getNumberWithType(type, loginInfo.getProject().name(), companyId);
}
@ApiOperation(value = "获取题型数量")
@GetMapping(path = "/type/number")
public List<TheoryQuestionCountVO> getNumberUnderKnowledgeAndType(@RequestAttribute LoginUserInfoVO loginInfo, @RequestParam(required = false) Integer companyId) {
public List<TheoryQuestionCountVO> getNumberUnderKnowledgeAndType(@RequestAttribute LoginUserInfoVO loginInfo, @RequestParam(required = false) Long companyId) {
String projectCode = Project.isDefault(loginInfo.getProject()) ? null : loginInfo.getProject().name();
return iQuestionBankService.countNumByType(projectCode, companyId);

62
src/main/java/club/joylink/rtss/controller/draft/Draft3DLessonController.java Normal file
View File

@ -0,0 +1,62 @@
package club.joylink.rtss.controller.draft;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.services.draftData.Draft3DLessonService;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.draft.Lesson3DQueryVO;
import club.joylink.rtss.vo.draft.Lesson3DVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* 客流车站参数管理接口
*/
@RestController
@RequestMapping("/api/draft3dLesson")
public class Draft3DLessonController {
@Autowired
private Draft3DLessonService draft3DLessonService;
@GetMapping(path = "/paging")
public PageVO<Lesson3DVO> pagingQuery(Lesson3DQueryVO queryVO) {
PageVO<Lesson3DVO> list = this.draft3DLessonService.pagingQuery(queryVO);
return list;
}
@GetMapping(path = "/{id}")
public Lesson3DVO getById(@PathVariable Long id) {
Lesson3DVO param = this.draft3DLessonService.getById(id);
return param;
}
@PostMapping(path = "")
public String create(@RequestBody @Validated Lesson3DVO param,
@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY)
UserVO userVO) {
String id = this.draft3DLessonService.create(param, userVO);
return id;
}
@PutMapping(path = "/{id}/basic")
public void updateBasicInfo(@PathVariable Long id, @RequestBody @Validated Lesson3DVO param) {
this.draft3DLessonService.updateBasicInfo(id, param);
}
@PutMapping(path = "/{id}/data")
public void updateData(@PathVariable Long id, @RequestBody @Validated Lesson3DVO param) {
this.draft3DLessonService.updateData(id, param);
}
@DeleteMapping(path = "/{id}")
public void delete(@PathVariable Long id) {
this.draft3DLessonService.delete(id);
}
@PostMapping("/{id}/publish")
public void publish(@PathVariable Long id) {
this.draft3DLessonService.publish(id);
}
}

14
src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java
View File

@ -40,8 +40,8 @@ public class DraftMapController {
@ApiOperation(value = "获取地图草稿数据列表")
@GetMapping(path = "/list")
public List<DraftMapVO> list(Boolean drawWay, @ApiIgnore @RequestAttribute UserVO user) {
return iDraftMapService.list(drawWay, user);
public List<DraftMapVO> list(@ApiIgnore @RequestAttribute UserVO user) {
return iDraftMapService.list(user);
}
@ApiOperation(value = "根据草稿地图id查询数据")
@ -78,7 +78,7 @@ public class DraftMapController {
@ApiOperation(value = "查询地图及对应数据")
@GetMapping(path = "/{id}/mapDataDetail")
public Object getMapShapeData(@PathVariable Long id) {
public MapGraphDataNewVO getMapShapeData(@PathVariable Long id) {
return iDraftMapService.getMapShapeData(id);
}
@ -99,7 +99,7 @@ public class DraftMapController {
@ApiOperation(value = "草稿地图导出")
@GetMapping(path = "/{id}/export")
public MapVO export(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) {
public MapVO export(@PathVariable Long id) {
return this.iDraftMapService.export(id);
}
@ -593,10 +593,4 @@ public class DraftMapController {
public void deleteOperationDefinition(@PathVariable Long mapId, @PathVariable String code){
iDraftMapService.deleteOperationDefinition(mapId, code);
}
@ApiOperation(value = "处理信号机显示方向")
@PutMapping(path = "/handle/signal/directionshow")
public void handleSignalDirectionShowType() {
this.iDraftMapService.handleSignalDirectionShowType();
}
}

9
src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java
View File

@ -1,6 +1,8 @@
package club.joylink.rtss.controller.draft;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.services.ILessonDraftService;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.*;
import club.joylink.rtss.vo.client.validGroup.DraftLessonCreateCheck;
@ -28,6 +30,13 @@ public class LessonDraftController {
return this.iLessonDraftService.queryPagedDraftLesson(mapId, queryVO, user);
}
@ApiOperation(value = "分页查询个人当前项目下课程草稿")
@GetMapping(path = "/paged/self")
public PageVO<LessonVO> pagedQueryPersonalLesson(LessonQueryVO pageQueryVO,
@RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) {
return this.iLessonDraftService.pagedQueryPersonalLesson(pageQueryVO, loginInfo);
}
@ApiOperation(value = "获取课程树")
@GetMapping(path = "/{lessonId}/tree")
public List<TreeNode> getLessonTree(@PathVariable Long lessonId, @ApiIgnore @RequestAttribute UserVO user) {

8
src/main/java/club/joylink/rtss/controller/iscs/IscsController.java
View File

@ -40,7 +40,7 @@ public class IscsController {
@ApiOperation(value = "根据条件获取iscs数据")
@GetMapping
public IscsVO getIscsDataBy(IscsVO iscsVO, @ApiIgnore @RequestAttribute UserVO user) {
public IscsVO getIscsDataBy(@Validated IscsVO iscsVO, @ApiIgnore @RequestAttribute UserVO user) {
return this.iscsService.getIscsDataBy(iscsVO);
}
@ -50,6 +50,12 @@ public class IscsController {
iscsService.delete(id);
}
@ApiOperation("地图是否有iscs数据")
@GetMapping("hasData")
public boolean isExisted(Long mapId) {
return iscsService.isExistedWithMapId(mapId);
}
@ApiOperation("复制iscs数据")
@PostMapping("/copy")
public void copy(@RequestBody @Validated IscsCopyVO copyVO) {

32
src/main/java/club/joylink/rtss/controller/pay/WechatPayController.java Normal file
View File

@ -0,0 +1,32 @@
package club.joylink.rtss.controller.pay;
import club.joylink.rtss.services.pay.wechat.WechatPayService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping("/api/wechatPay")
public class WechatPayController {
@Autowired
private WechatPayService wechatPayService;
/**
* 微信支付回调接口
* @param data 数据主体
* @param signatureStr 签名
* @param timestamp 用于验签
* @param nonce 用于验签
* @param serial 平台证书序列号，如果与商户所持的平台证书序列号不一致，需更新证书
*/
@PostMapping("/receive")
public void receive(@RequestBody String data, @RequestHeader("Wechatpay-Signature") String signatureStr,
@RequestHeader("Wechatpay-Timestamp") String timestamp,
@RequestHeader("Wechatpay-Nonce") String nonce,
@RequestHeader("Wechatpay-Serial") String serial) {
log.info(String.format("微信回调信息：%s", data));
wechatPayService.receive(data, signatureStr, timestamp, nonce, serial);
}
}

91
src/main/java/club/joylink/rtss/controller/permission/OrderController.java
View File

@ -49,87 +49,28 @@ public class OrderController {
// -----------未完成接口------------
@ApiOperation(value = "订单支付")
@GetMapping(path = "/{id}/{payType}/pay")
public String pay(@PathVariable long id, @PathVariable String payType) {
return this.iOrderService.pay(id, payType);
}
@ApiOperation(value = "订单提交")
@PostMapping(path = "/submit")
public OrderCreateVO submit(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute UserVO user) {
return this.iOrderService.submit(orderCreateVO, user);
}
@ApiOperation(value = "计算订单总价")
@GetMapping(path = "/price")
public Float computeTotal(Long goodsId, Integer goodsAmount, Integer monthAmount) {
return this.iOrderService.compute(goodsId, goodsAmount, monthAmount);
}
@ApiOperation(value = "订单取消支付")
@PutMapping(path = "/{id}/cancelPay")
public void cancelPay(@PathVariable Long id, @RequestAttribute UserVO user) {
this.iOrderService.cancelPay(id, user);
}
/*
@ApiOperation(value = "创建订单")
@PostMapping(path="")
public void createOrder(@RequestBody @Validated OrderCreateVO order, @RequestAttribute @ApiIgnore UserVO user) {
this.iOrderService.createOrder(order, user);
}
*/
/**
* 快速生成订单
* @param order
* @param user
* @return 返回生成的订单id
*//*
@PostMapping(path = "/quicklyGenerateOrder")
public String quicklyGenerateOrder(@RequestBody OrderJsonVO order,@RequestAttribute UserVO user){
return this.iOrderService.quicklyGenerateOrder(order,user);
}
@ApiOperation(value = "计算订单总价")
@GetMapping(path = "/price")
public Float computeTotal(Long goodsId, Integer goodsAmount, Integer monthAmount) {
return this.iOrderService.compute(goodsId, goodsAmount, monthAmount);
}
@ApiOperation(value = "订单提交")
@PostMapping(path = "/submit")
public OrderCreateVO submit(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute UserVO user) {
return this.iOrderService.submit(orderCreateVO, user);
}
@ApiOperation(value = "订单支付")
@GetMapping(path = "/{id}/{payType}/pay")
public String pay(@PathVariable long id, @PathVariable String payType) {
return this.iOrderService.pay(id, payType);
}
// @ApiOperation(value = "订单支付完成，为用户生成权限,测试分发权限使用，先数据库修改订单状态")
// @GetMapping(path = "/{code}/{totalfee}/completePay")
// public SaleOrder completePay(@PathVariable String code,@PathVariable int totalfee) throws PayException {
// return this.iOrderService.completePay(code,totalfee,"03");
// @ApiOperation(value = "订单支付")
// @GetMapping(path = "/{id}/{payType}/pay")
// public String pay(@PathVariable long id, @PathVariable String payType) {
// return this.iOrderService.pay(id, payType, null);
// }
@ApiOperation(value = "订单提交")
@PostMapping(path = "/submit")
public OrderCreateVO submit(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute UserVO user) {
return this.iOrderService.submit(orderCreateVO, user);
}
@ApiOperation(value = "计算订单总价")
@GetMapping(path = "/price")
public Float computeTotal(Long goodsId, Integer goodsAmount, Integer monthAmount) {
return this.iOrderService.compute(goodsId, goodsAmount, monthAmount);
}
@ApiOperation(value = "订单取消支付")
@PutMapping(path = "/{id}/cancelPay")
public void cancelPay(@PathVariable Long id, @RequestAttribute UserVO user) {
this.iOrderService.cancelPay(id, user);
}
@ApiOperation(value = "查询订单")
@GetMapping(path = "/{id}")
public OrderCreateVO get(@PathVariable long id) {
return this.iOrderService.get(id);
}
*/
}

6
src/main/java/club/joylink/rtss/controller/project/DeviceController.java
View File

@ -181,4 +181,10 @@ public class DeviceController {
UserVO userVO) {
this.deviceService.addOrUpdateGzbDeviceConfig(userVO);
}
@PostMapping("/sdy/addOrUpdate")
public void addOrUpdateSdyDeviceConfig(@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY)
UserVO userVO) {
this.deviceService.addOrUpdateSdyDeviceConfig(userVO);
}
}

79
src/main/java/club/joylink/rtss/controller/publish/ExamController.java
View File

@ -1,12 +1,13 @@
package club.joylink.rtss.controller.publish;
import club.joylink.rtss.constants.BusinessConsts;
import club.joylink.rtss.services.IExamService;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.ExamDefinitionQueryVO;
import club.joylink.rtss.vo.client.ExamDefinitionVO;
import club.joylink.rtss.vo.client.ExamsLessonVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.validGroup.ExamDefinitionCheck;
import club.joylink.rtss.vo.client.validGroup.ExamDefinitionRulesCheck;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -26,47 +27,34 @@ public class ExamController {
@ApiOperation(value = "创建考试")
@PostMapping(path = "")
public void create(@RequestBody @Validated(value = {ExamDefinitionCheck.class, ExamDefinitionRulesCheck.class})
ExamDefinitionVO examDefinitionVO, @RequestAttribute @ApiIgnore UserVO user) {
public void create(@RequestBody @Validated ExamDefinitionVO examDefinitionVO, @RequestAttribute @ApiIgnore UserVO user) {
iExamService.create(examDefinitionVO, user);
}
@ApiOperation(value = "贵装备创建考试")
@PostMapping(path = "/project/GZB")
public void createGZBExam(@RequestBody @Validated(value = {ExamDefinitionCheck.class, ExamDefinitionRulesCheck.class})
ExamDefinitionVO examDefinitionVO, @RequestAttribute @ApiIgnore UserVO user) {
iExamService.createGZBExam(examDefinitionVO, user);
}
@ApiOperation(value = "检查分数是否合理")
@GetMapping(path = "/checkScore")
public boolean checkScore(@Validated(value = ExamDefinitionRulesCheck.class) ExamDefinitionVO examDefinitionVO) {
return iExamService.checkScore(examDefinitionVO);
}
// @ApiOperation(value = "查询课程下的章节信息")
// @GetMapping(path = "/{lessonId}/chapter")
// public CommonJsonResponse queryChapterInfo(@PathVariable(required = true) String lessonId) {
// return CommonJsonResponse.newSuccessResponse(iExamService.queryChapterInfo(lessonId));
// @Deprecated
// @ApiOperation(value = "查询课程所属产品下有实训的实训类型")
// @GetMapping(path = "/{lessonId}/trainingTypes")
// public List<String> queryTrainingTypes(@PathVariable Long lessonId) {
// return iExamService.queryTrainingTypes(lessonId);
// }
@ApiOperation(value = "查询课程所属产品下有实训的实训类型")
@GetMapping(path = "/{lessonId}/trainingTypes")
public List<String> queryTrainingTypes(@PathVariable Long lessonId) {
return iExamService.queryTrainingTypes(lessonId);
}
@ApiOperation(value = "查询试题信息及规则信息")
@GetMapping(path = "/{id}")
public ExamDefinitionVO queryExamInfo(@PathVariable Long id) {
return iExamService.queryExamInfo(id);
}
@ApiOperation(value = "查询课程信息及课程下的试题列表信息")
@GetMapping(path = "/{lessonId}/list")
public ExamsLessonVO queryExamList(@PathVariable Long lessonId, @ApiIgnore @RequestAttribute UserVO user) {
return iExamService.queryExamList(lessonId, user);
}
// @ApiOperation(value = "查询课程信息及课程下的试题列表信息")
// @GetMapping(path = "/{lessonId}/list")
// public ExamsLessonVO queryExamList(@PathVariable Long lessonId, @ApiIgnore @RequestAttribute UserVO user) {
// return iExamService.queryExamList(lessonId, user);
// }
@ApiOperation(value = "查询试题列表信息")
@GetMapping(path = "/list")
@ -76,23 +64,16 @@ public class ExamController {
@ApiOperation(value = "删除试题")
@DeleteMapping(path = "/{id}")
public void deleteExam(@PathVariable String id, @ApiIgnore @RequestAttribute UserVO user) {
public void deleteExam(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) {
iExamService.deleteExam(id, user);
}
// @ApiOperation(value = "查询章节下允许创建的最多题目数量")
// @GetMapping(path = "/trainingNum/{lessonId}/{chapterId}")
// public CommonJsonResponse queryTrainingNum(@PathVariable(required = true) String lessonId, @PathVariable(required = true) String chapterId) {
// int trainingNum = iExamService.queryTrainingNum(lessonId, chapterId);
// return CommonJsonResponse.newSuccessResponse(trainingNum);
// @ApiOperation(value = "根据课程和实训类型查询实训数量")
// @GetMapping(path = "/trainingNum/{lessonId}/{trainingType}")
// public Long queryTrainingNum(@PathVariable Long lessonId, @PathVariable String trainingType, String operateType) {
// return iExamService.queryTrainingNum(lessonId, trainingType, operateType);
// }
@ApiOperation(value = "根据课程和实训类型查询实训数量")
@GetMapping(path = "/trainingNum/{lessonId}/{trainingType}")
public Long queryTrainingNum(@PathVariable Long lessonId, @PathVariable String trainingType, String operateType) {
return iExamService.queryTrainingNum(lessonId, trainingType, operateType);
}
@ApiOperation(value = "试题上线")
@PutMapping(value = "/{id}/onLine")
public void onLine(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) {
@ -110,4 +91,28 @@ public class ExamController {
public void update(@PathVariable Long id, @RequestBody ExamDefinitionVO examDefinitionVO) {
this.iExamService.update(id, examDefinitionVO);
}
@ApiOperation(value = "分页查询当前登录项目下的试卷")
@GetMapping("/paged/loginProject")
public PageVO<ExamDefinitionVO> pagedQueryByLoginProject(ExamDefinitionQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) {
return this.iExamService.pagedQueryByLoginProject(queryVO, loginInfo);
}
@ApiOperation(value = "不分页查询当前登录项目下的试卷")
@GetMapping("/list/loginProject")
public List<ExamDefinitionVO> listQueryExamByLoginProject(ExamDefinitionQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) {
return this.iExamService.listQueryExamByLoginProject(queryVO, loginInfo);
}
@ApiOperation(value = "不分页查询组织下自己创建的试卷")
@GetMapping("/list/org/self")
public List<ExamDefinitionVO> listQueryOrgExamOfSelf(Long clsId, @RequestAttribute LoginUserInfoVO loginInfo) {
return this.iExamService.listQueryOrgExamICreated(clsId, loginInfo);
}
@ApiOperation("查询试卷")
@GetMapping("/list/{mapId}")
public List<ExamDefinitionVO> listQuery(@PathVariable Long mapId, String prdType) {
return iExamService.queryBasicInfo(mapId, prdType, BusinessConsts.STATUS_USE);
}
}

24
src/main/java/club/joylink/rtss/controller/publish/Lesson3dController.java Normal file
View File

@ -0,0 +1,24 @@
package club.joylink.rtss.controller.publish;
import club.joylink.rtss.services.publishData.Lesson3DService;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.draft.Lesson3DQueryVO;
import club.joylink.rtss.vo.draft.Lesson3DVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/lesson3d")
public class Lesson3dController {
@Autowired
private Lesson3DService lesson3DService;
@GetMapping("/paging")
public PageVO<Lesson3DVO> pagingQuery(Lesson3DQueryVO queryVO) {
return this.lesson3DService.pagingQuery(queryVO);
}
}

51
src/main/java/club/joylink/rtss/controller/publish/LessonController.java
View File

@ -1,15 +1,17 @@
package club.joylink.rtss.controller.publish;
import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.services.ILessonService;
import club.joylink.rtss.services.student.IClassStudentUserService;
import club.joylink.rtss.services.org.IOrgUserService;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.LessonQueryVO;
import club.joylink.rtss.vo.client.LessonTreeVO;
import club.joylink.rtss.vo.client.LessonVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.student.StudentClassVO;
import club.joylink.rtss.vo.client.org.DepartmentVO;
import club.joylink.rtss.vo.client.validGroup.LessonUpdateNameAndRemarksCheck;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -25,10 +27,11 @@ import java.util.List;
@RequestMapping("/api/lesson")
public class LessonController {
@Autowired
private ILessonService iLessonService;
@Autowired
private IClassStudentUserService iClassStudentUserService;
private IOrgUserService iOrgUserService;
@Autowired
public LessonController(ILessonService iLessonService) {
@ -53,16 +56,10 @@ public class LessonController {
return this.iLessonService.queryValidLessons(lessonQueryVO);
}
@ApiOperation(value = "根据班级获取关联课程列表")
@GetMapping(path = "/class/{classId}")
public List<LessonVO> queryLessons(@PathVariable Integer classId) {
return this.iClassStudentUserService.getLessonByClass(classId);
}
@ApiOperation(value = "根据课程获取关联班级信息列表")
@GetMapping(path = "/{lessonId}/classes")
public List<StudentClassVO> queryClassByLesson(@PathVariable Long lessonId) {
return this.iClassStudentUserService.getClassesByLesson(lessonId);
@ApiOperation(value = "根据部门获取关联课程列表")
@GetMapping(path = "/depart/{departId}")
public List<LessonVO> queryLessons(@PathVariable Long departId) {
return this.iOrgUserService.getLessonsByDepart(departId);
}
@ApiOperation(value = "获取课程列表")
@ -85,18 +82,12 @@ public class LessonController {
}
@Role(RoleEnum.LessonCreater)
@ApiOperation(value = "贵州装备教学实训删除正在使用的发布课程")
@ApiOperation(value = "用户删除教学实训删除自己发布的课程")
@DeleteMapping(path = "/usedLesson/{lessonId}")
public void deleteUsedLesson(@PathVariable Long lessonId, @RequestAttribute UserVO user) {
iLessonService.deleteUsedLesson(lessonId, user);
}
// @ApiOperation(value = "根据产品编码获取课程数据")
// @GetMapping(path = "/{mapId}/{prdId}/list")
// public List<LessonVO> getLessonListByPrd(@PathVariable Long mapId, @PathVariable Long prdId) {
// return this.iLessonService.getLessonListByMapAndPrd(mapId, prdId);
// }
@ApiOperation(value = "发布课程上线")
@PutMapping(path = "/{id}/onLine")
@Role({RoleEnum.Admin,RoleEnum.SuperAdmin})
@ -125,4 +116,24 @@ public class LessonController {
public void generateLessonAndExam(@ApiIgnore @RequestAttribute UserVO user, @RequestBody List<Long> mapIds) {
iLessonService.generateLessonAndExam(mapIds, user);
}
@ApiOperation(value = "分页查询用户当前登录的项目下的课程")
@GetMapping(path = "/paged/byLoginProject")
public PageVO<LessonVO> pagedQueryByLoginProject(LessonQueryVO queryVO,
@RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) {
return iLessonService.pagedQueryByLoginProject(queryVO, loginInfo);
}
@ApiOperation(value = "查询用户当前登录的项目下的课程")
@GetMapping(path = "/list/byLoginProject")
public List<LessonVO> queryByLoginProject(LessonQueryVO queryVO,
@RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) {
return iLessonService.queryByLoginProject(queryVO, loginInfo);
}
@ApiOperation(value = "查询自己给指定班级创建的课程")
@GetMapping(path = "/list/org/self")
public List<LessonVO> queryOrgLessonOfSelf(Long clsId, @RequestAttribute LoginUserInfoVO loginInfo) {
return iLessonService.queryOrgLessonOfSelf(clsId, loginInfo);
}
}

39
src/main/java/club/joylink/rtss/controller/publish/MapController.java
View File

@ -3,7 +3,6 @@ package club.joylink.rtss.controller.publish;
import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.IMapService;
import club.joylink.rtss.services.IReleaseService;
import club.joylink.rtss.services.local.LocalDataService;
@ -12,10 +11,7 @@ import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.*;
import club.joylink.rtss.vo.client.local.LocalDataVO;
import club.joylink.rtss.vo.client.map.*;
import club.joylink.rtss.vo.client.map.newmap.MapGraphDataNewVO;
import club.joylink.rtss.vo.client.map.newmap.MapPSDVO;
import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO;
import club.joylink.rtss.vo.client.map.newmap.*;
import club.joylink.rtss.vo.client.validGroup.MapInfoSortCheck;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -60,33 +56,24 @@ public class MapController {
return this.iMapService.findMapVersion(id);
}
//TODO New
@ApiOperation(value = "根据地图id查询地图明细")
@GetMapping(path = "/{id}/details")
public Object getMapDetailsById(@PathVariable Long id) {
public MapVO getMapDetailsById(@PathVariable Long id) {
MapVO mapVO = this.iMapService.getMapDetail(id);
return mapVO;
// if (mapVO.isDrawWay()) {
//
// return mapVO.getGraphDataNew();
// }
// return mapVO.getGraphData();
}
@ApiOperation("根据地图id查询绘图数据")
@GetMapping("/{id}/graphData")
public MapGraphDataNewVO getGraphData(@PathVariable Long id) {
MapVO mapVO = this.iMapService.getMapDetail(id);
if (mapVO.isDrawWay()) {
return mapVO.getGraphDataNew();
}
throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception(String.format("意外的老版地图[%s]", id));
return mapVO.getGraphDataNew();
}
@ApiOperation(value = "根据地图id查询地图数据")
@GetMapping(path = "/{id}/mapData")
public Object getMapDataById(@PathVariable Long id) {
public MapVO getMapDataById(@PathVariable Long id) {
MapVO mapVO = this.iMapService.getMapDetail(id);
return mapVO;
}
@ -261,6 +248,18 @@ public class MapController {
return this.iMapService.getStationHasPsdStands(id, stationCode);
}
@ApiOperation("获取地图车站下的区段")
@GetMapping("/{id}/station/{stationCode}/sections")
public List<MapSectionNewVO> querySectionsUnderTheStation(@PathVariable Long id, @PathVariable String stationCode){
return this.iMapService.querySectionsUnderTheStation(id, stationCode);
}
@ApiOperation("获取集中站下所有区段")
@GetMapping("/{id}/deviceStation/{stationCode}/sections")
public List<MapSectionNewVO> querySectionBelongTheDeviceStation(@PathVariable Long id, @PathVariable String stationCode) {
return this.iMapService.querySectionBelongTheDeviceStation(id, stationCode);
}
@ApiOperation(value = "获取地图站台关联的屏蔽门")
@GetMapping("/{id}/stand/{standCode}/psd")
public List<MapPSDVO> getStandPsds(@PathVariable Long id,
@ -297,4 +296,10 @@ public class MapController {
public List<MapStationNewVO> getAllStations() {
return iMapService.getAllStations();
}
@ApiOperation("查询地图下所有区段")
@GetMapping("/{id}/sections")
public List<MapSectionNewVO> querySectionsUnderMap(@PathVariable Long id) {
return iMapService.querySectionsUnderMap(id);
}
}

62
src/main/java/club/joylink/rtss/controller/publish/MapGroupController.java Normal file
View File

@ -0,0 +1,62 @@
package club.joylink.rtss.controller.publish;
import club.joylink.rtss.services.IMapGroupService;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.ReleaseVO;
import club.joylink.rtss.vo.client.map.MapGroupQueryVO;
import club.joylink.rtss.vo.client.map.MapGroupVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = {"地图数据组管理"})
@RestController
@RequestMapping("/api/mapGroup")
public class MapGroupController {
@Autowired
private IMapGroupService iMapGroupService;
@ApiOperation(value = "添加地图数据组")
@PostMapping(path = "")
public void createMapGroup(@RequestBody @Validated MapGroupVO mapGroupVO) {
this.iMapGroupService.create(mapGroupVO);
}
@ApiOperation(value = "修改地图数据组")
@PutMapping(path = "{groupId}")
public void updateMapGroup(@PathVariable Long groupId, @RequestBody @Validated MapGroupVO mapGroupVO) {
this.iMapGroupService.update(groupId, mapGroupVO);
}
@ApiOperation(value = "地图数据组关联地图")
@PutMapping(path = "{groupId}/ref/map/{mapId}")
public void refMap2Group(@PathVariable Long groupId, @PathVariable Long mapId) {
this.iMapGroupService.relMap2Group(groupId, mapId);
}
@ApiOperation(value = "删除地图数据组")
@DeleteMapping(path = "{groupId}")
public void deleteMapGroup(@PathVariable Long groupId) {
this.iMapGroupService.delete(groupId);
}
@ApiOperation(value = "分页获取所有地图数据组")
@GetMapping(path = "page")
public PageVO<MapGroupVO> getPageMapGroups(MapGroupQueryVO queryVO) {
return this.iMapGroupService.getPage(queryVO);
}
@ApiOperation("同步导入地图相关数据")
@PutMapping("/syc/import")
public void importFromJson(@RequestBody ReleaseVO json, @RequestAttribute UserVO user) {
iMapGroupService.syncImportMapData(json, user);
}
}

28
src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java
View File

@ -45,13 +45,6 @@ public class RunPlanDraftController {
return iRunPlanDraftService.create(runPlanVO, user);
}
@ApiOperation(value = "自动生成运行图车次数据")
@PostMapping(path = "/{id}")
@Deprecated
public RunPlanEChartsDataVO create(@RequestBody @Validated RunPlanInput runPlanInput, @PathVariable Long id,@ApiIgnore @RequestAttribute UserVO user) {
return iRunPlanDraftService.createCommon(id,runPlanInput,user);
}
@ApiOperation(value = "修改运行图名称")
@PutMapping(path = "/{id}")
public void updateName(@PathVariable Long id, @RequestBody @Validated(value = RunPlanNameCheck.class) RunPlanVO runPlanVO,
@ -93,7 +86,7 @@ public class RunPlanDraftController {
@ApiOperation(value = "运行图草稿发布")
@PostMapping(path = "/{planId}/publish")
public List<String> publish(@PathVariable Long planId, @RequestAttribute UserVO user) {
List<String> checkedList = this.dataCheck(planId);
List<String> checkedList = this.dataCheck(planId,user);
if(CollectionUtils.isEmpty(checkedList)) {
iRunPlanDraftService.publish(planId, user);
}
@ -146,7 +139,7 @@ public class RunPlanDraftController {
return this.iRunPlanDraftService.ifServerExists(planId, serviceNumber);
}
@ApiOperation(value = "查询交路列表")
@ApiOperation(value = "查询地图默认交路列表")
@GetMapping(path = "/{planId}/routingList")
public List getRoutingList(@PathVariable Long planId) {
return this.iRunPlanDraftService.getRoutingList(planId);
@ -171,9 +164,9 @@ public class RunPlanDraftController {
}
@ApiOperation(value = "根据用户交路查询交路区段列表")
@GetMapping(path = "/{planId}/{routingCode}/userRoutingSectionList")
public List<RunPlanRoutingSection> getRoutingSectionList(@PathVariable Long planId, @PathVariable String routingCode, @ApiIgnore @RequestAttribute UserVO user) {
return this.iRunPlanRoutingService.getRoutingSectionDataBy(user.getId() , planId, routingCode);
@GetMapping(path = "/{routingCode}/routingSectionList")
public List<RunPlanRoutingSection> getRoutingSectionList( @PathVariable Long routingCode, @ApiIgnore @RequestAttribute UserVO user) {
return this.iRunPlanRoutingService.getRoutingSectionDataBy(user.getId() , routingCode);
}
@ApiOperation(value = "增加计划")
@ -242,9 +235,8 @@ public class RunPlanDraftController {
@ApiOperation(value = "修改任务")
@PutMapping(path = "/{planId}/trip/{SDTNumber}")
public void updateRunPlanTrip(@PathVariable Long planId, @PathVariable String SDTNumber,
@RequestBody @Validated RunPlanTripConfigVO tripConfig,
@ApiIgnore @RequestAttribute UserVO user) {
this.iRunPlanDraftService.updateRunPlanTrip(planId, SDTNumber, tripConfig, user);
@RequestBody @Validated RunPlanTripConfigVO tripConfig) {
this.iRunPlanDraftService.updateRunPlanTrip(planId, SDTNumber, tripConfig);
}
@ApiOperation(value = "修改任务车次号")
@ -263,8 +255,8 @@ public class RunPlanDraftController {
//TODO
@ApiOperation(value = "有效性检查")
@GetMapping (path = "/{planId}/check")
public List<String> dataCheck(@PathVariable Long planId) {
return this.iRunPlanDraftService.dataCheck(planId);
public List<String> dataCheck(@PathVariable Long planId,@ApiIgnore @RequestAttribute UserVO user) {
return this.iRunPlanDraftService.dataCheck(planId,user.getId());
}
//Temp use
@ -279,7 +271,7 @@ public class RunPlanDraftController {
@GetMapping (path = "/{planId}/simulation")
public String simulationCheck(@PathVariable Long planId, @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY)
LoginUserInfoVO loginUserInfoVO) {
List<String> checkedList = this.dataCheck(planId);
List<String> checkedList = this.dataCheck(planId,loginUserInfoVO.getUserVO());
if(CollectionUtils.isEmpty(checkedList)) {
return this.iRunPlanDraftService.simulationCheck(planId, loginUserInfoVO);
}

21
src/main/java/club/joylink/rtss/controller/runplan/RunPlanUserDataController.java
View File

@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@Api(tags = {"运行计划用户数据接口"})
@RestController
@ -36,13 +37,13 @@ public class RunPlanUserDataController {
@PostMapping(path = "/routing")
public void createUserRouting(@RequestBody @Validated RunPlanRoutingVO routingVO, @RequestAttribute UserVO user) {
routingVO.setUserId(user.getId());
iRunPlanRoutingService.createUserRouting(routingVO);
iRunPlanRoutingService.createUserRouting(routingVO);
}
@ApiOperation(value = "生成通用交路区段数据")
@PostMapping(path = "/routing/path/generate")
public RunPlanRoutingVO generateUserRoutingPath(@RequestBody @Validated RunPlanRoutingVO routingVO) {
return iRunPlanRoutingService.generateUserRouting(routingVO);
return iRunPlanRoutingService.generateUserRoutingData(routingVO);
}
@ApiOperation(value = "分页获取用户交路")
@ -51,6 +52,12 @@ public class RunPlanUserDataController {
return iRunPlanRoutingService.queryPagedUserRouting(user.getId(), mapId, queryVO);
}
@ApiOperation(value = "用户同步默认交路相关数据:运行等级/停站时间/折返时间")
@PutMapping(path = "/{mapId}/defaultRouting/sync")
public void pullDefaultRouting(@PathVariable Long mapId,@RequestAttribute UserVO user) {
iRunPlanRoutingService.syncDefaultRoutingRefData(user.getId(), mapId);
}
@ApiOperation(value = "获取用户交路数据")
@GetMapping(path = "/{mapId}/routing")
public List<RunPlanRoutingVO> queryUserRoutings(@PathVariable Long mapId, @RequestAttribute UserVO user) {
@ -65,7 +72,8 @@ public class RunPlanUserDataController {
@ApiOperation(value = "更新用户交路")
@PutMapping(path = "/routing/{routingId}")
public void updateUserRouting(@PathVariable Long routingId, @RequestBody @Validated RunPlanRoutingVO routingVO) {
public void updateUserRouting(@PathVariable Long routingId, @RequestBody @Validated RunPlanRoutingVO routingVO,@RequestAttribute UserVO user) {
routingVO.setUserId(user.getId());
iRunPlanRoutingService.updateUserRouting(routingId, routingVO);
}
@ -87,6 +95,12 @@ public class RunPlanUserDataController {
iRunPlanRunlevelService.updateRefLevels(user.getId(), mapId, list);
}
@ApiOperation(value = "用于区段数据变化时更新站间距离且重新计算运行等级数据")
@PutMapping(path = "/{mapId}/runlevelDistance")
public List<RunPlanRunlevelVO> updateRunlevelDistance(@PathVariable Long mapId, @RequestAttribute UserVO user) {
return iRunPlanRunlevelService.updateRunlevelDistance(user.getId(), mapId);
}
@ApiOperation(value = "分页获取用户轨道停车时间")
@GetMapping(path = "/{mapId}/parktime/page")
public PageVO<RunPlanParkingTimeVO> queryPagedUserParktime(@PathVariable Long mapId, RunPlanParktimeQueryVO queryVO, @RequestAttribute UserVO user) {
@ -110,4 +124,5 @@ public class RunPlanUserDataController {
public RunPlanUserConfigVO getUserConfig(@PathVariable Long mapId, @RequestAttribute UserVO user) {
return iRunPlanUserConfigService.getConfig(user.getId(), mapId);
}
}

36
src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java
View File

@ -3,6 +3,7 @@ package club.joylink.rtss.controller.simulation;
import club.joylink.rtss.controller.advice.AuthenticateInterceptor;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.IVirtualRealityIbpService;
import club.joylink.rtss.services.simulation.SimulationSupportService;
import club.joylink.rtss.simulation.cbtc.ATS.data.AtsAlarm;
import club.joylink.rtss.simulation.cbtc.ATS.data.SimulationLog;
import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
@ -18,8 +19,8 @@ import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.fault.FaultRuleVO;
import club.joylink.rtss.vo.client.map.DestinationCodeVO;
import club.joylink.rtss.vo.client.map.MapVO;
import club.joylink.rtss.vo.client.map.newmap.MapDestinationCodeDefinitionVO;
import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
import club.joylink.rtss.vo.client.runplan.PlanTripNumberVO;
import club.joylink.rtss.vo.client.runplan.RunPlanEChartsDataVO;
@ -55,12 +56,16 @@ public class SimulationV1Controller {
@Autowired
private IVirtualRealityIbpService iVirtualRealityIBPService;
@Autowired
private SimulationSupportService simulationSupportService;
@ApiOperation(value = "根据产品类型创建仿真")
@GetMapping("")
public String simulation(Long mapId, String prdType,
@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY)
LoginUserInfoVO loginUserInfoVO) {
return this.groupSimulationService.simulation(mapId, prdType, loginUserInfoVO);
String simulation = this.groupSimulationService.simulation(mapId, prdType, loginUserInfoVO);
return simulation;
}
@ApiOperation(value = "创建实训仿真")
@ -259,7 +264,7 @@ public class SimulationV1Controller {
@ApiOperation(value = "查询所有目的地码")
@GetMapping("/{group}/destinationCode/list")
public List<MapDestinationCodeDefinitionVO> getAllDestinationCode(@PathVariable String group) {
public List<DestinationCodeVO> getAllDestinationCode(@PathVariable String group) {
return this.groupSimulationService.getAllDestinationCode(group);
}
@ -271,8 +276,8 @@ public class SimulationV1Controller {
@ApiOperation("按下IBP盘按钮")
@PutMapping("/{group}/ibp/{button}")
public void pressIbpButton(@PathVariable String group, String stationCode, @PathVariable VirtualRealityIbp.Button button) {
iVirtualRealityIBPService.pressTheButton(group, stationCode, button);
public void pressIbpButton(@PathVariable String group, String stationCode, @PathVariable VirtualRealityIbp.ButtonType button, String buttonCode) {
iVirtualRealityIBPService.pressTheButton(group, stationCode, button, buttonCode);
}
@ApiOperation("查询报警列表")
@ -291,7 +296,7 @@ public class SimulationV1Controller {
@ApiOperation("仿真客流数据切换")
@PutMapping(path = "/{group}/passengerFlow/{passengerFlowId}")
public void AlarmConfirm(@PathVariable String group,@PathVariable Long passengerFlowId) {
public void AlarmConfirm(@PathVariable String group, @PathVariable Long passengerFlowId) {
groupSimulationService.changePassengerFlow(group, passengerFlowId);
}
@ -300,4 +305,23 @@ public class SimulationV1Controller {
public PageVO<SimulationLog> getLog(@PathVariable String group, SimulationLogPagedQueryVO queryVO) {
return groupSimulationService.getLog(group, queryVO);
}
/* ----------------------- 泰雷兹操作辅助接口 ----------------------- */
@ApiOperation("查询进路路径")
@GetMapping("/{group}/querySectionPaths")
public List<List<String>> querySectionPaths(@PathVariable String group, String groupNumber, String standCode, String signalCode) {
return simulationSupportService.queryRoutePaths(group, groupNumber, standCode, signalCode);
}
@ApiOperation("查询列车或运行线经过的站台")
@GetMapping("/{group}/queryStands/trainOrDestination")
public List<String> queryStandsThatTrainGoingThrough(@PathVariable String group, String groupNumber, String destinationCode) {
return simulationSupportService.queryStandsThatTrainGoingThrough(group, groupNumber, destinationCode);
}
@ApiOperation("查询为该列车已建立的进路")
@GetMapping("/{group}/queryEstablishedRoutes/{groupNumber}")
public List<String> queryEstablishedRoutes(@PathVariable String group, @PathVariable String groupNumber) {
return simulationSupportService.queryEstablishedRoutes(group, groupNumber);
}
}

7
src/main/java/club/joylink/rtss/controller/training/TrainingV1Controller.java
View File

@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.constraints.NotBlank;
import java.util.Map;
import java.util.Set;
@Api(tags = { "实训数据管理接口" })
@ -195,4 +196,10 @@ public class TrainingV1Controller {
public TrainingNewVO loadTraining(@PathVariable String group, @PathVariable Long id) {
return iTrainingService.loadTraining(group, id);
}
@ApiOperation("查询实训、操作类型及数量")
@GetMapping("/trainingTypeAndQuantity")
public Map<String, Map<String, Long>> queryTrainingTypeAndQuantity(Long mapId, String prdType) {
return iTrainingService.queryTrainingTypeAndQuantity(mapId, prdType);
}
}

39
src/main/java/club/joylink/rtss/controller/user/UserController.java
View File

@ -4,14 +4,11 @@ import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.services.local.UserGenerateService;
import club.joylink.rtss.services.student.IClassStudentUserService;
import club.joylink.rtss.services.student.IDepartUserStatisticService;
import club.joylink.rtss.vo.UserQueryVO;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.UserConfigVO;
import club.joylink.rtss.vo.client.student.ExportStudentInfo;
import club.joylink.rtss.vo.client.student.ImportStudentInfo;
import club.joylink.rtss.vo.client.student.StudentClassVO;
import club.joylink.rtss.vo.client.student.StudentInfoExportParam;
import club.joylink.rtss.vo.client.user.WeChatBindStatusVO;
import club.joylink.rtss.vo.user.UserGenerateConfigVO;
@ -37,19 +34,7 @@ public class UserController {
private UserGenerateService userGenerateService;
@Autowired
private IClassStudentUserService iClassStudentUserService;
@ApiOperation(value = "更新用户配置")
@PostMapping(path = "/config")
public void saveUserConfig(@RequestBody @Validated List<UserConfigVO> userConfigVOList, @RequestAttribute @ApiIgnore UserVO user) {
this.iSysUserService.saveUserConfig(user.getId(), userConfigVOList);
}
@ApiOperation(value = "获取用户配置")
@GetMapping(path = "/config")
public List<UserConfigVO> getUserConfig(@RequestAttribute @ApiIgnore UserVO user) {
return this.iSysUserService.getUserConfig(user.getId());
}
private IDepartUserStatisticService iDepartUserStatisticService;
@Role({RoleEnum.SuperAdmin})
@ApiOperation(value = "生成线下环境用户")
@ -111,22 +96,10 @@ public class UserController {
return this.iSysUserService.fuzzyQueryPagedUser(fuzzyParam);
}
@ApiOperation(value="贵州装备制造导入学生信息接口")
@PostMapping(path="/project/{projectCode}/import/student")
public void importStudents(@PathVariable String projectCode, @Validated @RequestBody ImportStudentInfo importStudentInfo, @RequestAttribute @ApiIgnore UserVO user){
this.iClassStudentUserService.importStudentInfos(projectCode, importStudentInfo, user);
}
@ApiOperation(value="贵州装备制造导出学生信息及成绩接口")
@PutMapping(path="/project/{projectCode}/export/student")
public List<ExportStudentInfo> importStudents(@PathVariable String projectCode, @Validated @RequestBody StudentInfoExportParam infoExportParam){
return this.iClassStudentUserService.studentInfoStatistics(infoExportParam);
}
@ApiOperation(value="贵州装备制造查询对应的班级")
@GetMapping(path="/project/{projectCode}/classes")
public List<StudentClassVO> getClasses(@PathVariable String projectCode){
return this.iClassStudentUserService.getClassesByProjectCode(projectCode);
@ApiOperation(value="导出部门学生信息及成绩接口")
@PutMapping(path="/scores")
public List<ExportStudentInfo> getStudentSores( @Validated @RequestBody StudentInfoExportParam infoExportParam){
return this.iDepartUserStatisticService.studentInfoStatistics(infoExportParam);
}
@ApiOperation("查询销售人员")

14
src/main/java/club/joylink/rtss/controller/user/UserExamController.java
View File

@ -2,16 +2,14 @@ package club.joylink.rtss.controller.user;
import club.joylink.rtss.constants.RoleEnum;
import club.joylink.rtss.controller.advice.Role;
import club.joylink.rtss.services.IUserExamService;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import club.joylink.rtss.services.IUserExamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import springfox.documentation.annotations.ApiIgnore;
@Api(tags = { "用户考试接口" })
@ -72,4 +70,10 @@ public class UserExamController {
public void queryPagedUserExam(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) {
this.iUserExamService.deleteUserExam(id, user);
}
@ApiOperation("查询组织成员的考试成绩")
@GetMapping("/paged/orgUser/{orgId}/{examId}")
public PageVO<UserExamVO> pagedQueryOrgUserExamResult(@PathVariable Long orgId, @PathVariable Long examId, PageQueryVO queryVO) {
return this.iUserExamService.pagedQueryOrgUserExamResult(orgId, examId, queryVO);
}
}

7
src/main/java/club/joylink/rtss/controller/user/UserInfoController.java
View File

@ -6,6 +6,8 @@ import club.joylink.rtss.vo.client.user.MobileInfoVO;
import club.joylink.rtss.vo.client.user.UpdateEmailVO;
import club.joylink.rtss.vo.client.user.UpdateMobileVO;
import club.joylink.rtss.vo.client.user.UpdatePasswordVO;
import club.joylink.rtss.vo.user.UserInfoVO;
import club.joylink.rtss.vo.user.UserRegisterCheck;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,6 +24,11 @@ public class UserInfoController {
@Autowired
private ISysUserService iSysUserService;
@PostMapping("/register")
public void register(@RequestBody @Validated(value = UserRegisterCheck.class) UserInfoVO userInfoVO) {
this.iSysUserService.register(userInfoVO);
}
@ApiOperation(value = "根据姓名或电话号查询用户")
@GetMapping(path="/nameOrMobile")
public List<UserVO> queryUserByNameOrMobile(String query) {

2
src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java
View File

@ -37,7 +37,7 @@ public class UserPermissionController {
@ApiOperation(value = "获取用户可以分发的权限")
@GetMapping(path="/getAvailableUserPermission")
public List<UserPermissionVO> findAvailablePermission(DistributeSelectVO distributeSelectVO, @RequestAttribute @ApiIgnore UserVO user) {
return this.iUserPermissionService.findUserPermissionVOListThatCanDistribute(distributeSelectVO,user);
return this.iUserPermissionService.queryUserPermissionVOListThatCanDistribute(distributeSelectVO,user);
}
@ApiOperation(value = "分页获取个人权限数据")

30
src/main/java/club/joylink/rtss/controller/voice/VoiceController.java Normal file
View File

@ -0,0 +1,30 @@
package club.joylink.rtss.controller.voice;
import club.joylink.rtss.services.IVoiceService;
import club.joylink.rtss.vo.client.VoiceRecognitionResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@Api("语音AI接口")
@RestController
@RequestMapping("/api/voice")
public class VoiceController {
@Autowired
@Qualifier("HuaWeiVoiceService")
private IVoiceService iVoiceService;
@ApiOperation("语音识别")
@PostMapping("recognition")
public VoiceRecognitionResult voiceRecognition(MultipartFile file) {
return this.iVoiceService.voiceRecognition(file, "");
}
}

12
src/main/java/club/joylink/rtss/dao/CgyRecordDAO.java Normal file
View File

@ -0,0 +1,12 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.CgyRecord;
import club.joylink.rtss.entity.CgyRecordExample;
import org.springframework.stereotype.Repository;
/**
* CgyRecordDAO继承基类
*/
@Repository
public interface CgyRecordDAO extends MyBatisBaseDao<CgyRecord, Integer, CgyRecordExample> {
}

24
src/main/java/club/joylink/rtss/dao/CompanyDAO.java
View File

@ -1,12 +1,12 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.Company;
import club.joylink.rtss.entity.CompanyExample;
import org.springframework.stereotype.Repository;
/**
* CompanyDAO继承基类
*/
@Repository
public interface CompanyDAO extends MyBatisBaseDao<Company, Integer, CompanyExample> {
}
//package club.joylink.rtss.dao;
//
//import club.joylink.rtss.entity.Company;
//import club.joylink.rtss.entity.CompanyExample;
//import org.springframework.stereotype.Repository;
//
///**
// * CompanyDAO继承基类
// */
////@Repository
////public interface CompanyDAO extends MyBatisBaseDao<Company, Integer, CompanyExample> {
////}

41
src/main/java/club/joylink/rtss/dao/Draft3dLessonDAO.java Normal file
View File

@ -0,0 +1,41 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.Draft3dLesson;
import club.joylink.rtss.entity.Draft3dLessonExample;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface Draft3dLessonDAO {
long countByExample(Draft3dLessonExample example);
int deleteByExample(Draft3dLessonExample example);
int deleteByPrimaryKey(Long id);
int insert(Draft3dLesson record);
int insertSelective(Draft3dLesson record);
List<Draft3dLesson> selectByExampleWithBLOBs(Draft3dLessonExample example);
List<Draft3dLesson> selectByExample(Draft3dLessonExample example);
Draft3dLesson selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") Draft3dLesson record, @Param("example") Draft3dLessonExample example);
int updateByExampleWithBLOBs(@Param("record") Draft3dLesson record, @Param("example") Draft3dLessonExample example);
int updateByExample(@Param("record") Draft3dLesson record, @Param("example") Draft3dLessonExample example);
int updateByPrimaryKeySelective(Draft3dLesson record);
int updateByPrimaryKeyWithBLOBs(Draft3dLesson record);
int updateByPrimaryKey(Draft3dLesson record);
}

5
src/main/java/club/joylink/rtss/dao/DraftMapDAO.java
View File

@ -3,11 +3,10 @@ package club.joylink.rtss.dao;
import club.joylink.rtss.entity.DraftMap;
import club.joylink.rtss.entity.DraftMapExample;
import club.joylink.rtss.entity.DraftMapWithBLOBs;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface DraftMapDAO {
long countByExample(DraftMapExample example);
@ -37,4 +36,4 @@ public interface DraftMapDAO {
int updateByPrimaryKeyWithBLOBs(DraftMapWithBLOBs record);
int updateByPrimaryKey(DraftMap record);
}
}

36
src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java
View File

@ -2,45 +2,18 @@ package club.joylink.rtss.dao;
import club.joylink.rtss.entity.LearnMessage;
import club.joylink.rtss.entity.LearnMessageExample;
import club.joylink.rtss.entity.LearnMessageWithBLOBs;
import club.joylink.rtss.vo.client.post.LearnMessagePagedQueryVO;
import club.joylink.rtss.vo.client.post.LearnMessageVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* LearnMessageDAO继承基类
*/
@Repository
public interface LearnMessageDAO {
long countByExample(LearnMessageExample example);
int deleteByExample(LearnMessageExample example);
int deleteByPrimaryKey(Long id);
int insert(LearnMessageWithBLOBs record);
int insertSelective(LearnMessageWithBLOBs record);
List<LearnMessageWithBLOBs> selectByExampleWithBLOBs(LearnMessageExample example);
List<LearnMessage> selectByExample(LearnMessageExample example);
LearnMessageWithBLOBs selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") LearnMessageWithBLOBs record, @Param("example") LearnMessageExample example);
int updateByExampleWithBLOBs(@Param("record") LearnMessageWithBLOBs record, @Param("example") LearnMessageExample example);
int updateByExample(@Param("record") LearnMessage record, @Param("example") LearnMessageExample example);
int updateByPrimaryKeySelective(LearnMessageWithBLOBs record);
int updateByPrimaryKeyWithBLOBs(LearnMessageWithBLOBs record);
int updateByPrimaryKey(LearnMessage record);
public interface LearnMessageDAO extends MyBatisBaseDao<LearnMessage, Long, LearnMessageExample> {
@Select("<script>" +
"SELECT\n" +
" learn_message.id AS id,\n" +
@ -52,6 +25,7 @@ public interface LearnMessageDAO {
// "learn_message.`like` AS `like`,\n" +
// "learn_message.unlike AS unlike,\n" +
" learn_message.topping AS topping,\n" +
" learn_message.user_name AS cgyUserName,\n" +
" sys_user.nickname AS creatorNickName,\n" +
" sys_user.avatar_path AS creatorAvatarPath\n" +
// "learn_comment.id AS commentList\n" +

41
src/main/java/club/joylink/rtss/dao/Lesson3dDAO.java Normal file
View File

@ -0,0 +1,41 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.Lesson3d;
import club.joylink.rtss.entity.Lesson3dExample;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface Lesson3dDAO {
long countByExample(Lesson3dExample example);
int deleteByExample(Lesson3dExample example);
int deleteByPrimaryKey(Long id);
int insert(Lesson3d record);
int insertSelective(Lesson3d record);
List<Lesson3d> selectByExampleWithBLOBs(Lesson3dExample example);
List<Lesson3d> selectByExample(Lesson3dExample example);
Lesson3d selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") Lesson3d record, @Param("example") Lesson3dExample example);
int updateByExampleWithBLOBs(@Param("record") Lesson3d record, @Param("example") Lesson3dExample example);
int updateByExample(@Param("record") Lesson3d record, @Param("example") Lesson3dExample example);
int updateByPrimaryKeySelective(Lesson3d record);
int updateByPrimaryKeyWithBLOBs(Lesson3d record);
int updateByPrimaryKey(Lesson3d record);
}

12
src/main/java/club/joylink/rtss/dao/LsLessonDAO.java
View File

@ -25,13 +25,13 @@ public interface LsLessonDAO extends MyBatisBaseDao<LsLesson, Long, LsLessonExam
@Insert(value = "<script>" +
"insert into ls_lesson (id, map_id, prd_type, `name`, " +
" remarks, author_id, update_time, " +
" creator_id, city_code, `status`) " +
" creator_id, city_code, `status`, sysFault) " +
" values " +
" <foreach collection=\"list\" item=\"entity\" separator=\",\"> " +
" (#{entity.id,jdbcType=BIGINT}, #{entity.mapId,jdbcType=BIGINT}, #{entity.prdType,jdbcType=VARCHAR}," +
" #{entity.name,jdbcType=VARCHAR}, #{entity.remarks,jdbcType=VARCHAR}, #{entity.authorId,jdbcType=BIGINT}," +
" #{entity.updateTime,jdbcType=TIMESTAMP}, #{entity.creatorId,jdbcType=BIGINT}," +
" #{entity.cityCode,jdbcType=VARCHAR}, #{entity.status,jdbcType=VARCHAR})"+
" #{entity.cityCode,jdbcType=VARCHAR}, #{entity.status,jdbcType=VARCHAR}, #{entity.sysfault,jdbcType=BIT})"+
" </foreach>" +
"</script>")
int batchInsertWithId(@Param("list") List<LsLesson> lessonList);
@ -47,7 +47,8 @@ public interface LsLessonDAO extends MyBatisBaseDao<LsLesson, Long, LsLessonExam
@Result (column="update_time", property="updateTime"),
@Result (column="creator_id", property="creatorId"),
@Result (column="city_code", property="cityCode"),
@Result (column="status", property="status")
@Result (column="status", property="status"),
@Result (column="sysfault", property="systemFault")
}
)
@Select("<script>" +
@ -66,8 +67,11 @@ public interface LsLessonDAO extends MyBatisBaseDao<LsLesson, Long, LsLessonExam
"<if test=\"prdType != null\">" +
" AND ls_lesson.prd_type = #{prdType}\n" +
"</if>" +
"<if test=\"mapId != null\">" +
" AND ls_lesson.map_id = #{mapId}\n" +
"</if>" +
"ORDER BY\n" +
"\tls_lesson.id ASC" +
"</script>")
List<LessonVO> getValidLesson(List<Long> ids, String prdType);
List<LessonVO> getValidLesson(Long mapId, List<Long> ids, String prdType);
}

27
src/main/java/club/joylink/rtss/dao/MapGroupDAO.java Normal file
View File

@ -0,0 +1,27 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.MapGroup;
import club.joylink.rtss.entity.MapGroupExample;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
/**
* MapGroupDAO继承基类
*/
@Repository
public interface MapGroupDAO extends MyBatisBaseDao<MapGroup, Long, MapGroupExample> {
@Select("SELECT\n" + "*\n" + "FROM\n" +
"map_group\n" +
"WHERE\n" +
"group_type = #{type}\n" +
"AND\n" +
"(map_ids LIKE CONCAT('[',#{mapId},',%')\n" +
"OR\n" +
"map_ids LIKE CONCAT('%,',#{mapId},']')\n" +
"OR\n" +
"map_ids LIKE CONCAT('%,',#{mapId},',%'))\n" +
"LIMIT 1")
MapGroup findEntityByMapId(String type,Long mapId);
}

2
src/main/java/club/joylink/rtss/dao/MapInfoDAO.java
View File

@ -22,7 +22,7 @@ public interface MapInfoDAO extends MyBatisBaseDao<MapInfo, Long, MapInfoExample
" <foreach collection=\"list\" item=\"entity\" separator=\",\"> " +
" (#{entity.id,jdbcType=BIGINT}, #{entity.name,jdbcType=VARCHAR}, #{entity.lineCode,jdbcType=VARCHAR}," +
" #{entity.cityCode,jdbcType=VARCHAR}, #{entity.status,jdbcType=VARCHAR}, #{entity.project,jdbcType=BIT}," +
" #{entity.projectCode,jdbcType=VARCHAR}, #{entity.drawWay,jdbcType=BIT}, #{entity.orderNumber,jdbcType=INTEGER}," +
" #{entity.projectCode,jdbcType=VARCHAR}, #{entity.orderNumber,jdbcType=INTEGER}," +
" #{entity.version,jdbcType=VARCHAR})" +
" </foreach>" +
"</script>")

16
src/main/java/club/joylink/rtss/dao/OrgDAO.java Normal file
View File

@ -0,0 +1,16 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.Org;
import club.joylink.rtss.entity.OrgExample;
import club.joylink.rtss.vo.client.ExamDefinitionVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* OrgDAO继承基类
*/
@Repository
public interface OrgDAO extends MyBatisBaseDao<Org, Long, OrgExample> {
List<ExamDefinitionVO> queryByExamIds(List<Long> examIds, String status);
}

25
src/main/java/club/joylink/rtss/dao/OrgExamDAO.java Normal file
View File

@ -0,0 +1,25 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.Org;
import club.joylink.rtss.entity.OrgExam;
import club.joylink.rtss.entity.OrgExamExample;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* OrgExamDAO继承基类
*/
@Repository
public interface OrgExamDAO extends MyBatisBaseDao<OrgExam, OrgExam, OrgExamExample> {
@Select("<script>" +
"SELECT c.* " +
"FROM org c INNER JOIN org_exam " +
"ON id = org_id " +
"AND exam_id = #{examId} " +
"</script>")
List<Org> getDepartsByExamId(@Param("examId") Long examId);
}

26
src/main/java/club/joylink/rtss/dao/OrgLessonDAO.java Normal file
View File

@ -0,0 +1,26 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.Org;
import club.joylink.rtss.entity.OrgLesson;
import club.joylink.rtss.entity.OrgLessonExample;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* OrgLessonDAO继承基类
*/
@Repository
public interface OrgLessonDAO extends MyBatisBaseDao<OrgLesson, OrgLesson, OrgLessonExample> {
@Select("<script>" +
"SELECT org.`name` " +
"FROM org " +
"INNER JOIN org_lesson " +
"ON org.id = org_lesson.org_id " +
"AND org_lesson.lesson_id = #{lessonId} " +
"</script>")
List<String> getClassNames(@Param("lessonId") Long lessonId);
}

40
src/main/java/club/joylink/rtss/dao/OrgScoringRuleDAO.java Normal file
View File

@ -0,0 +1,40 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.OrgScoringRule;
import club.joylink.rtss.entity.OrgScoringRuleExample;
import club.joylink.rtss.entity.OrgScoringRuleWithBLOBs;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface OrgScoringRuleDAO {
long countByExample(OrgScoringRuleExample example);
int deleteByExample(OrgScoringRuleExample example);
int deleteByPrimaryKey(Long id);
int insert(OrgScoringRuleWithBLOBs record);
int insertSelective(OrgScoringRuleWithBLOBs record);
List<OrgScoringRuleWithBLOBs> selectByExampleWithBLOBs(OrgScoringRuleExample example);
List<OrgScoringRule> selectByExample(OrgScoringRuleExample example);
OrgScoringRuleWithBLOBs selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") OrgScoringRuleWithBLOBs record, @Param("example") OrgScoringRuleExample example);
int updateByExampleWithBLOBs(@Param("record") OrgScoringRuleWithBLOBs record, @Param("example") OrgScoringRuleExample example);
int updateByExample(@Param("record") OrgScoringRule record, @Param("example") OrgScoringRuleExample example);
int updateByPrimaryKeySelective(OrgScoringRuleWithBLOBs record);
int updateByPrimaryKeyWithBLOBs(OrgScoringRuleWithBLOBs record);
int updateByPrimaryKey(OrgScoringRule record);
}

15
src/main/java/club/joylink/rtss/dao/OrgScoringRuleRelDAO.java Normal file
View File

@ -0,0 +1,15 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.OrgScoringRuleRel;
import club.joylink.rtss.entity.OrgScoringRuleRelExample;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* OrgScoringRuleRelDAO继承基类
*/
@Repository
public interface OrgScoringRuleRelDAO extends MyBatisBaseDao<OrgScoringRuleRel, OrgScoringRuleRel, OrgScoringRuleRelExample> {
void batchInsert(List<OrgScoringRuleRel> rels);
}

23
src/main/java/club/joylink/rtss/dao/OrgUserDAO.java Normal file
View File

@ -0,0 +1,23 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.OrgUser;
import club.joylink.rtss.entity.OrgUserExample;
import club.joylink.rtss.vo.client.org.OrgUserVO;
import club.joylink.rtss.vo.client.org.CompanyUserQueryVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* OrgUserDAO继承基类
*/
@Repository
public interface OrgUserDAO extends MyBatisBaseDao<OrgUser, Long, OrgUserExample> {
List<OrgUserVO> getCompanyDepartUsers(CompanyUserQueryVO companyUserQueryVO);
List<OrgUserVO> getUserCompanyDeparts(@Param("companyId")Integer companyId, @Param("userId")Long userId);
List<OrgUser> getCompanyManger(@Param("userId") Long userId);
}

42
src/main/java/club/joylink/rtss/dao/PfStationParamDAO.java Normal file
View File

@ -0,0 +1,42 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.PfStationParam;
import club.joylink.rtss.entity.PfStationParamExample;
import club.joylink.rtss.entity.PfStationParamWithBLOBs;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface PfStationParamDAO {
long countByExample(PfStationParamExample example);
int deleteByExample(PfStationParamExample example);
int deleteByPrimaryKey(Long id);
int insert(PfStationParamWithBLOBs record);
int insertSelective(PfStationParamWithBLOBs record);
List<PfStationParamWithBLOBs> selectByExampleWithBLOBs(PfStationParamExample example);
List<PfStationParam> selectByExample(PfStationParamExample example);
PfStationParamWithBLOBs selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") PfStationParamWithBLOBs record, @Param("example") PfStationParamExample example);
int updateByExampleWithBLOBs(@Param("record") PfStationParamWithBLOBs record, @Param("example") PfStationParamExample example);
int updateByExample(@Param("record") PfStationParam record, @Param("example") PfStationParamExample example);
int updateByPrimaryKeySelective(PfStationParamWithBLOBs record);
int updateByPrimaryKeyWithBLOBs(PfStationParamWithBLOBs record);
int updateByPrimaryKey(PfStationParam record);
}

14
src/main/java/club/joylink/rtss/dao/ProjectServerDAO.java Normal file
View File

@ -0,0 +1,14 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.ProjectServer;
import club.joylink.rtss.entity.ProjectServerExample;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* ProjectServerDAO继承基类
*/
@Mapper
@Repository
public interface ProjectServerDAO extends MyBatisBaseDao<ProjectServer, Long, ProjectServerExample> {
}

4
src/main/java/club/joylink/rtss/dao/RaceQuestionDAO.java
View File

@ -15,6 +15,6 @@ import java.util.List;
@Repository
public interface RaceQuestionDAO extends MyBatisBaseDao<RaceQuestion, Long, RaceQuestionExample> {
List<QuestionVO> selectWithRef(@Param("topic") String topic, @Param("type") String type, @Param("projectCode") String projectCode, @Param("companyId") Integer companyId);
List<TheoryQuestionCountVO> countNumByType(@Param("projectCode") String projectCode, @Param("companyId") Integer companyId);
List<QuestionVO> selectWithRef(@Param("topic") String topic, @Param("type") String type, @Param("projectCode") String projectCode, @Param("companyId") Long companyId);
List<TheoryQuestionCountVO> countNumByType(@Param("projectCode") String projectCode, @Param("companyId") Long companyId);
}

19
src/main/java/club/joylink/rtss/dao/RaceQuestionProgressDAO.java
View File

@ -2,7 +2,6 @@ package club.joylink.rtss.dao;
import club.joylink.rtss.entity.RaceQuestionProgress;
import club.joylink.rtss.entity.RaceQuestionProgressExample;
import org.apache.ibatis.annotations.Insert;
import org.springframework.stereotype.Repository;
/**
@ -10,20 +9,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface RaceQuestionProgressDAO extends MyBatisBaseDao<RaceQuestionProgress, Long, RaceQuestionProgressExample> {
@Insert("<script>" +
"INSERT INTO race_question_progress " +
"(id,user_id,project_code,company_id,question_index,incorrect)" +
"VALUES " +
"(#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT}, #{projectCode,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{questionIndex,jdbcType=BIGINT}, #{incorrect,jdbcType=VARCHAR}) " +
"ON DUPLICATE KEY UPDATE " +
"<trim suffixOverrides=\",\"> " +
"<if test=\"questionIndex != null\"> " +
"question_index=VALUES (question_index), " +
"</if> " +
"<if test=\"incorrect != null\"> " +
"incorrect=VALUES (incorrect) " +
"</if> " +
"</trim> " +
"</script>")
void insertOrUpdateSelective(RaceQuestionProgress record);
}
}

28
src/main/java/club/joylink/rtss/dao/RaceResultDAO.java
View File

@ -2,37 +2,11 @@ package club.joylink.rtss.dao;
import club.joylink.rtss.entity.RaceResult;
import club.joylink.rtss.entity.RaceResultExample;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* RaceResultDAO继承基类
*/
@Repository
public interface RaceResultDAO extends MyBatisBaseDao<RaceResult, Long, RaceResultExample> {
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
@Insert(value = "<script>" +
" insert into race_result (user_race_id, question_topic, question_id, question_option_id, answer_content, correct, score, total_score, remarks,user_id,project_code)\n" +
" values " +
" <foreach collection=\"list\" item=\"entity\" separator=\",\"> " +
" (#{entity.userRaceId,jdbcType=BIGINT}, \n" +
" #{entity.questionTopic,jdbcType=VARCHAR}, \n" +
" #{entity.questionId,jdbcType=BIGINT}, \n" +
" #{entity.questionOptionId,jdbcType=VARCHAR}, \n" +
" #{entity.answerContent,jdbcType=VARCHAR}, " +
" #{entity.correct,jdbcType=TINYINT}, \n" +
" #{entity.score,jdbcType=INTEGER}, \n" +
" #{entity.totalScore,jdbcType=INTEGER}, \n" +
" #{entity.remarks,jdbcType=VARCHAR}," +
" #{entity.userId,jdbcType=BIGINT}," +
" #{entity.projectCode,jdbcType=VARCHAR})" +
" </foreach>" +
"</script>")
int batchInsert(@Param("list") List<RaceResult> list);
}
}

16
src/main/java/club/joylink/rtss/dao/RunPlanRoutingDAO.java
View File

@ -42,18 +42,14 @@ public interface RunPlanRoutingDAO {
"SELECT COUNT(*) " +
"FROM run_plan_routing " +
"WHERE map_id = #{mapId} " +
"AND user_id = #{userId} " +
"<if test=\"userId == null\">\n" +
"AND user_id IS NULL " +
"</if> " +
"<if test=\"userId != null\">\n" +
"AND user_id = #{userId}\n" +
"</if> " +
"AND section_data = #{sectionData} " +
"</script>")
Integer countUserRoutingBySectionData(@Param("userId") Long userId, @Param("mapId") Long mapId, @Param("sectionData") String sectionData);
@ResultMap("ResultMapWithBLOBs")
@Select("<script>" +
"SELECT * " +
"FROM run_plan_routing " +
"WHERE map_id = #{mapId} " +
"AND user_id = #{userId} " +
"AND section_data = #{sectionData} " +
"</script>")
RunPlanRouting getUserRoutingBySectionData(@Param("userId") Long userId, @Param("mapId") Long mapId, @Param("sectionData") String sectionData);
}

51
src/main/java/club/joylink/rtss/dao/SysUserDAO.java
View File

@ -20,7 +20,7 @@ public interface SysUserDAO extends MyBatisBaseDao<SysUser, Long, SysUserExample
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
@Insert(value = "<script>" +
" insert into sys_user (account, `name`, nickname, \n" +
" insert into sys_user (account, org_id, `name`, nickname, \n" +
" avatar_path, `password`, mobile, \n" +
" nationcode, email, wx_id, \n" +
" wx_union_id, wm_open_id, `status`, \n" +
@ -28,7 +28,7 @@ public interface SysUserDAO extends MyBatisBaseDao<SysUser, Long, SysUserExample
" update_user_id, update_time)\n" +
" values " +
" <foreach collection=\"list\" item=\"entity\" separator=\",\"> " +
" (#{entity.account,jdbcType=VARCHAR}, #{entity.name,jdbcType=VARCHAR}, #{entity.nickname,jdbcType=VARCHAR}, \n" +
" (#{entity.account,jdbcType=VARCHAR}, #{entity.orgId, jdbcType=BIGINT}, #{entity.name,jdbcType=VARCHAR}, #{entity.nickname,jdbcType=VARCHAR}, \n" +
" #{entity.avatarPath,jdbcType=VARCHAR}, #{entity.password,jdbcType=VARCHAR}, #{entity.mobile,jdbcType=VARCHAR}, \n" +
" #{entity.nationcode,jdbcType=VARCHAR}, #{entity.email,jdbcType=VARCHAR}, #{entity.wxId,jdbcType=VARCHAR}, \n" +
" #{entity.wxUnionId,jdbcType=VARCHAR}, #{entity.wmOpenId,jdbcType=VARCHAR}, #{entity.status,jdbcType=VARCHAR}, \n" +
@ -47,49 +47,6 @@ public interface SysUserDAO extends MyBatisBaseDao<SysUser, Long, SysUserExample
"</script>")
List<DailyLiveQuantityVO> statisticsDailyRegister(@Param("beginDate") LocalDate beginDate, @Param("endDate") LocalDate endDate);
List<UserVO> pagedQueryWithCompany(UserQueryVO queryVO);
// @Results(value = {
// @Result(column = "id", property = "id"),
// @Result(column = "account", property = "account"),
// @Result(column = "name", property = "name"),
// @Result(column = "nickname", property = "nickname"),
// @Result(column = "avatar_path", property = "avatarPath"),
// @Result(column = "password", property = "password"),
// @Result(column = "mobile", property = "mobile"),
// @Result(column = "nationcode", property = "nationcode"),
// @Result(column = "email", property = "email"),
// @Result(column = "wx_id", property = "wxId"),
// @Result(column = "wx_union_id", property = "wxUnionId"),
// @Result(column = "wm_open_id", property = "wmOpenId"),
// @Result(column = "status", property = "status"),
// @Result(column = "roles", property = "roles"), //这行有问题
// @Result(column = "create_time", property = "createTime"),
// @Result(column = "company_id", property = "companyId"),
// @Result(column = "company.name", property = "companyName")
// })
// @Select("<script>" +
// "select\n" +
// " <if test=\"distinct\">\n" +
// " distinct\n" +
// " </if>\n" +
// " <include refid=\"Base_Column_List\" />\n" +
// " , company.name" +
// " from sys_user left join company on sys_user.company_id = company.id\n" +
// " <if test=\"_parameter != null\">\n" +
// " <include refid=\"Example_Where_Clause\" />\n" +
// " </if>\n" +
// " <if test=\"orderByClause != null\">\n" +
// " order by ${orderByClause}\n" +
// " </if>\n" +
// " <if test=\"limit != null\">\n" +
// " <if test=\"offset != null\">\n" +
// " limit ${offset}, ${limit}\n" +
// " </if>\n" +
// " <if test=\"offset == null\">\n" +
// " limit ${limit}\n" +
// " </if>\n" +
// " </if>" +
// "</script>")
// List<UserVO> selectUserWithCompanyName(SysUserExample example);
List<UserVO> queryUsersWithCompany(UserQueryVO queryVO);
UserVO queryUserWithCompany(@Param("userId") Long userId);
}

15
src/main/java/club/joylink/rtss/dao/UserCompanyRelDAO.java
View File

@ -1,15 +0,0 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.UserCompanyRel;
import club.joylink.rtss.entity.UserCompanyRelExample;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* UserCompanyRelDAO继承基类
*/
@Repository
public interface UserCompanyRelDAO extends MyBatisBaseDao<UserCompanyRel, Long, UserCompanyRelExample> {
void batchUpdate(List<UserCompanyRel> ucrList);
}

33
src/main/java/club/joylink/rtss/dao/UserConfigMapper.java
View File

@ -1,33 +0,0 @@
package club.joylink.rtss.dao;
import club.joylink.rtss.entity.UserConfig;
import club.joylink.rtss.entity.UserConfigExample;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface UserConfigMapper {
long countByExample(UserConfigExample example);
int deleteByExample(UserConfigExample example);
int deleteByPrimaryKey(Long id);
int insert(UserConfig record);
int insertSelective(UserConfig record);
List<UserConfig> selectByExample(UserConfigExample example);
UserConfig selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") UserConfig record, @Param("example") UserConfigExample example);
int updateByExample(@Param("record") UserConfig record, @Param("example") UserConfigExample example);
int updateByPrimaryKeySelective(UserConfig record);
int updateByPrimaryKey(UserConfig record);
}

14
src/main/java/club/joylink/rtss/dao/UserExamMapper.java
View File

@ -1,11 +1,12 @@
package club.joylink.rtss.dao;
import com.github.pagehelper.Page;
import club.joylink.rtss.entity.UserExam;
import club.joylink.rtss.entity.UserExamExample;
import club.joylink.rtss.vo.client.UserExamListVO;
import club.joylink.rtss.vo.client.UserExamQueryVO;
import club.joylink.rtss.vo.client.UserExamVO;
import club.joylink.rtss.vo.client.UserRankStatsVO;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@ -108,4 +109,15 @@ public interface UserExamMapper {
"AND (DATE(start_time) BETWEEN #{beginDate} AND #{endDate}) " +
"</script>")
Integer getMaxScoreBy(@Param("userId") Long userId, @Param("examId") Long examId, @Param("beginDate") LocalDate beginDate, @Param("endDate") LocalDate endDate);
List<UserExamVO> queryOrgUserExamResult(Integer orgId, Long examId);
@Select("SELECT " +
"MAX(user_exam.score) " +
"FROM " +
"user_exam " +
"WHERE " +
"user_id = #{userId} " +
"AND exam_id = #{examId}")
Integer findHeightScoreUserExam(Long userId, Long examId);
}

16
src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java
View File

@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@Repository
@ -59,6 +60,21 @@ public interface UserTrainingStatsMapper {
"</script>")
List<UserRankStatsVO> selectRankByLessonId(Long lessonId);
@Select("<script>" +
"SELECT SUM(ut.duration) AS duration, " +
"COUNT(*) AS count, " +
"u.name AS username, " +
"ut.user_id AS userId " +
"FROM user_training_stats ut " +
"LEFT JOIN sys_user u ON u.id = ut.user_id " +
"WHERE u.id = #{userId} AND ut.finish_time &gt;= #{startTime} AND ut.finish_time &lt;= #{endTime} " +
"AND ut.lesson_id IN" +
"<foreach collection='lessonIds' item='lessonId' open='(' separator=',' close=')'>" +
"#{lessonId}" +
"</foreach>" +
"</script>")
UserRankStatsVO selectRank(LocalDateTime startTime, LocalDateTime endTime, List<Long> lessonIds, Long userId);
@Select("<script>" +
"SELECT dd.name AS statsProjectName, " +
"SUM(ut.duration) AS duration, " +

88
src/main/java/club/joylink/rtss/entity/CgyRecord.java Normal file
View File

@ -0,0 +1,88 @@
package club.joylink.rtss.entity;
import java.io.Serializable;
/**
* @author
* 成都工业项目使用记录
*/
public class CgyRecord implements Serializable {
private Integer id;
/**
* 浏览次数
*/
private Integer browseCount;
/**
* 百度网盘链接打开次数
*/
private Integer downloadCount;
private static final long serialVersionUID = 1L;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getBrowseCount() {
return browseCount;
}
public void setBrowseCount(Integer browseCount) {
this.browseCount = browseCount;
}
public Integer getDownloadCount() {
return downloadCount;
}
public void setDownloadCount(Integer downloadCount) {
this.downloadCount = downloadCount;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
CgyRecord other = (CgyRecord) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getBrowseCount() == null ? other.getBrowseCount() == null : this.getBrowseCount().equals(other.getBrowseCount()))
&& (this.getDownloadCount() == null ? other.getDownloadCount() == null : this.getDownloadCount().equals(other.getDownloadCount()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getBrowseCount() == null) ? 0 : getBrowseCount().hashCode());
result = prime * result + ((getDownloadCount() == null) ? 0 : getDownloadCount().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", browseCount=").append(browseCount);
sb.append(", downloadCount=").append(downloadCount);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

402
src/main/java/club/joylink/rtss/entity/CgyRecordExample.java Normal file
View File

@ -0,0 +1,402 @@
package club.joylink.rtss.entity;
import java.util.ArrayList;
import java.util.List;
public class CgyRecordExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
private Integer limit;
private Long offset;
public CgyRecordExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public Integer getLimit() {
return limit;
}
public void setOffset(Long offset) {
this.offset = offset;
}
public Long getOffset() {
return offset;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Integer value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Integer value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Integer value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Integer value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Integer value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Integer value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Integer value1, Integer value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Integer value1, Integer value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andBrowseCountIsNull() {
addCriterion("browse_count is null");
return (Criteria) this;
}
public Criteria andBrowseCountIsNotNull() {
addCriterion("browse_count is not null");
return (Criteria) this;
}
public Criteria andBrowseCountEqualTo(Integer value) {
addCriterion("browse_count =", value, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountNotEqualTo(Integer value) {
addCriterion("browse_count <>", value, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountGreaterThan(Integer value) {
addCriterion("browse_count >", value, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountGreaterThanOrEqualTo(Integer value) {
addCriterion("browse_count >=", value, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountLessThan(Integer value) {
addCriterion("browse_count <", value, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountLessThanOrEqualTo(Integer value) {
addCriterion("browse_count <=", value, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountIn(List<Integer> values) {
addCriterion("browse_count in", values, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountNotIn(List<Integer> values) {
addCriterion("browse_count not in", values, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountBetween(Integer value1, Integer value2) {
addCriterion("browse_count between", value1, value2, "browseCount");
return (Criteria) this;
}
public Criteria andBrowseCountNotBetween(Integer value1, Integer value2) {
addCriterion("browse_count not between", value1, value2, "browseCount");
return (Criteria) this;
}
public Criteria andDownloadCountIsNull() {
addCriterion("download_count is null");
return (Criteria) this;
}
public Criteria andDownloadCountIsNotNull() {
addCriterion("download_count is not null");
return (Criteria) this;
}
public Criteria andDownloadCountEqualTo(Integer value) {
addCriterion("download_count =", value, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountNotEqualTo(Integer value) {
addCriterion("download_count <>", value, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountGreaterThan(Integer value) {
addCriterion("download_count >", value, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountGreaterThanOrEqualTo(Integer value) {
addCriterion("download_count >=", value, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountLessThan(Integer value) {
addCriterion("download_count <", value, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountLessThanOrEqualTo(Integer value) {
addCriterion("download_count <=", value, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountIn(List<Integer> values) {
addCriterion("download_count in", values, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountNotIn(List<Integer> values) {
addCriterion("download_count not in", values, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountBetween(Integer value1, Integer value2) {
addCriterion("download_count between", value1, value2, "downloadCount");
return (Criteria) this;
}
public Criteria andDownloadCountNotBetween(Integer value1, Integer value2) {
addCriterion("download_count not between", value1, value2, "downloadCount");
return (Criteria) this;
}
}
/**
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

46
src/main/java/club/joylink/rtss/entity/Draft3dLesson.java Normal file
View File

@ -0,0 +1,46 @@
package club.joylink.rtss.entity;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* @author
* 单机三维教学任务表
*/
@Data
public class Draft3dLesson implements Serializable {
private Long id;
/**
* 三维任务名称
*/
private String name;
/**
* 任务所属类型
*/
private String type;
/**
* 状态
*/
private String state;
/**
* 创建人id
*/
private Long userId;
private LocalDateTime createTime;
private LocalDateTime updateTime;
/**
* 任务步骤数据
*/
private String data;
private static final long serialVersionUID = 1L;
}

673
src/main/java/club/joylink/rtss/entity/Draft3dLessonExample.java Normal file
View File

@ -0,0 +1,673 @@
package club.joylink.rtss.entity;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
public class Draft3dLessonExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
private Integer limit;
private Long offset;
public Draft3dLessonExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public Integer getLimit() {
return limit;
}
public void setOffset(Long offset) {
this.offset = offset;
}
public Long getOffset() {
return offset;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("`name` is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("`name` is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("`name` =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("`name` <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("`name` >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("`name` >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("`name` <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("`name` <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("`name` like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("`name` not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("`name` in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("`name` not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("`name` between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("`name` not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andTypeIsNull() {
addCriterion("`type` is null");
return (Criteria) this;
}
public Criteria andTypeIsNotNull() {
addCriterion("`type` is not null");
return (Criteria) this;
}
public Criteria andTypeEqualTo(String value) {
addCriterion("`type` =", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotEqualTo(String value) {
addCriterion("`type` <>", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThan(String value) {
addCriterion("`type` >", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("`type` >=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThan(String value) {
addCriterion("`type` <", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("`type` <=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLike(String value) {
addCriterion("`type` like", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotLike(String value) {
addCriterion("`type` not like", value, "type");
return (Criteria) this;
}
public Criteria andTypeIn(List<String> values) {
addCriterion("`type` in", values, "type");
return (Criteria) this;
}
public Criteria andTypeNotIn(List<String> values) {
addCriterion("`type` not in", values, "type");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("`type` between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("`type` not between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andStateIsNull() {
addCriterion("`state` is null");
return (Criteria) this;
}
public Criteria andStateIsNotNull() {
addCriterion("`state` is not null");
return (Criteria) this;
}
public Criteria andStateEqualTo(String value) {
addCriterion("`state` =", value, "state");
return (Criteria) this;
}
public Criteria andStateNotEqualTo(String value) {
addCriterion("`state` <>", value, "state");
return (Criteria) this;
}
public Criteria andStateGreaterThan(String value) {
addCriterion("`state` >", value, "state");
return (Criteria) this;
}
public Criteria andStateGreaterThanOrEqualTo(String value) {
addCriterion("`state` >=", value, "state");
return (Criteria) this;
}
public Criteria andStateLessThan(String value) {
addCriterion("`state` <", value, "state");
return (Criteria) this;
}
public Criteria andStateLessThanOrEqualTo(String value) {
addCriterion("`state` <=", value, "state");
return (Criteria) this;
}
public Criteria andStateLike(String value) {
addCriterion("`state` like", value, "state");
return (Criteria) this;
}
public Criteria andStateNotLike(String value) {
addCriterion("`state` not like", value, "state");
return (Criteria) this;
}
public Criteria andStateIn(List<String> values) {
addCriterion("`state` in", values, "state");
return (Criteria) this;
}
public Criteria andStateNotIn(List<String> values) {
addCriterion("`state` not in", values, "state");
return (Criteria) this;
}
public Criteria andStateBetween(String value1, String value2) {
addCriterion("`state` between", value1, value2, "state");
return (Criteria) this;
}
public Criteria andStateNotBetween(String value1, String value2) {
addCriterion("`state` not between", value1, value2, "state");
return (Criteria) this;
}
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(LocalDateTime value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(LocalDateTime value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(LocalDateTime value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(LocalDateTime value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(LocalDateTime value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(LocalDateTime value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<LocalDateTime> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<LocalDateTime> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(LocalDateTime value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(LocalDateTime value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(LocalDateTime value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(LocalDateTime value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(LocalDateTime value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(LocalDateTime value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<LocalDateTime> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<LocalDateTime> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
}
/**
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

18
src/main/java/club/joylink/rtss/entity/DraftMap.java
View File

@ -30,11 +30,6 @@ public class DraftMap implements Serializable {
*/
private String lineCode;
/**
* 图形绘制方式：0：旧；1：新方式
*/
private Boolean drawWay;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -77,14 +72,6 @@ public class DraftMap implements Serializable {
this.lineCode = lineCode;
}
public Boolean getDrawWay() {
return drawWay;
}
public void setDrawWay(Boolean drawWay) {
this.drawWay = drawWay;
}
@Override
public boolean equals(Object that) {
if (this == that) {
@ -101,8 +88,7 @@ public class DraftMap implements Serializable {
&& (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getAuthorId() == null ? other.getAuthorId() == null : this.getAuthorId().equals(other.getAuthorId()))
&& (this.getLineCode() == null ? other.getLineCode() == null : this.getLineCode().equals(other.getLineCode()))
&& (this.getDrawWay() == null ? other.getDrawWay() == null : this.getDrawWay().equals(other.getDrawWay()));
&& (this.getLineCode() == null ? other.getLineCode() == null : this.getLineCode().equals(other.getLineCode()));
}
@Override
@ -114,7 +100,6 @@ public class DraftMap implements Serializable {
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getAuthorId() == null) ? 0 : getAuthorId().hashCode());
result = prime * result + ((getLineCode() == null) ? 0 : getLineCode().hashCode());
result = prime * result + ((getDrawWay() == null) ? 0 : getDrawWay().hashCode());
return result;
}
@ -129,7 +114,6 @@ public class DraftMap implements Serializable {
sb.append(", updateTime=").append(updateTime);
sb.append(", authorId=").append(authorId);
sb.append(", lineCode=").append(lineCode);
sb.append(", drawWay=").append(drawWay);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

60
src/main/java/club/joylink/rtss/entity/DraftMapExample.java
View File

@ -444,66 +444,6 @@ public class DraftMapExample {
addCriterion("line_code not between", value1, value2, "lineCode");
return (Criteria) this;
}
public Criteria andDrawWayIsNull() {
addCriterion("draw_way is null");
return (Criteria) this;
}
public Criteria andDrawWayIsNotNull() {
addCriterion("draw_way is not null");
return (Criteria) this;
}
public Criteria andDrawWayEqualTo(Boolean value) {
addCriterion("draw_way =", value, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayNotEqualTo(Boolean value) {
addCriterion("draw_way <>", value, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayGreaterThan(Boolean value) {
addCriterion("draw_way >", value, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayGreaterThanOrEqualTo(Boolean value) {
addCriterion("draw_way >=", value, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayLessThan(Boolean value) {
addCriterion("draw_way <", value, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayLessThanOrEqualTo(Boolean value) {
addCriterion("draw_way <=", value, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayIn(List<Boolean> values) {
addCriterion("draw_way in", values, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayNotIn(List<Boolean> values) {
addCriterion("draw_way not in", values, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayBetween(Boolean value1, Boolean value2) {
addCriterion("draw_way between", value1, value2, "drawWay");
return (Criteria) this;
}
public Criteria andDrawWayNotBetween(Boolean value1, Boolean value2) {
addCriterion("draw_way not between", value1, value2, "drawWay");
return (Criteria) this;
}
}
/**

10
src/main/java/club/joylink/rtss/entity/DraftMapRouteFlankProtection.java
View File

@ -22,16 +22,6 @@ public class DraftMapRouteFlankProtection implements Serializable {
*/
private String code;
/**
* 所属联锁站唯一编码
*/
private String stationCode;
/**
* 编号
*/
private String number;
/**
* 名称
*/

140
src/main/java/club/joylink/rtss/entity/DraftMapRouteFlankProtectionExample.java
View File

@ -314,146 +314,6 @@ public class DraftMapRouteFlankProtectionExample {
return (Criteria) this;
}
public Criteria andStationCodeIsNull() {
addCriterion("station_code is null");
return (Criteria) this;
}
public Criteria andStationCodeIsNotNull() {
addCriterion("station_code is not null");
return (Criteria) this;
}
public Criteria andStationCodeEqualTo(String value) {
addCriterion("station_code =", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeNotEqualTo(String value) {
addCriterion("station_code <>", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeGreaterThan(String value) {
addCriterion("station_code >", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeGreaterThanOrEqualTo(String value) {
addCriterion("station_code >=", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeLessThan(String value) {
addCriterion("station_code <", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeLessThanOrEqualTo(String value) {
addCriterion("station_code <=", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeLike(String value) {
addCriterion("station_code like", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeNotLike(String value) {
addCriterion("station_code not like", value, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeIn(List<String> values) {
addCriterion("station_code in", values, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeNotIn(List<String> values) {
addCriterion("station_code not in", values, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeBetween(String value1, String value2) {
addCriterion("station_code between", value1, value2, "stationCode");
return (Criteria) this;
}
public Criteria andStationCodeNotBetween(String value1, String value2) {
addCriterion("station_code not between", value1, value2, "stationCode");
return (Criteria) this;
}
public Criteria andNumberIsNull() {
addCriterion("`number` is null");
return (Criteria) this;
}
public Criteria andNumberIsNotNull() {
addCriterion("`number` is not null");
return (Criteria) this;
}
public Criteria andNumberEqualTo(String value) {
addCriterion("`number` =", value, "number");
return (Criteria) this;
}
public Criteria andNumberNotEqualTo(String value) {
addCriterion("`number` <>", value, "number");
return (Criteria) this;
}
public Criteria andNumberGreaterThan(String value) {
addCriterion("`number` >", value, "number");
return (Criteria) this;
}
public Criteria andNumberGreaterThanOrEqualTo(String value) {
addCriterion("`number` >=", value, "number");
return (Criteria) this;
}
public Criteria andNumberLessThan(String value) {
addCriterion("`number` <", value, "number");
return (Criteria) this;
}
public Criteria andNumberLessThanOrEqualTo(String value) {
addCriterion("`number` <=", value, "number");
return (Criteria) this;
}
public Criteria andNumberLike(String value) {
addCriterion("`number` like", value, "number");
return (Criteria) this;
}
public Criteria andNumberNotLike(String value) {
addCriterion("`number` not like", value, "number");
return (Criteria) this;
}
public Criteria andNumberIn(List<String> values) {
addCriterion("`number` in", values, "number");
return (Criteria) this;
}
public Criteria andNumberNotIn(List<String> values) {
addCriterion("`number` not in", values, "number");
return (Criteria) this;
}
public Criteria andNumberBetween(String value1, String value2) {
addCriterion("`number` between", value1, value2, "number");
return (Criteria) this;
}
public Criteria andNumberNotBetween(String value1, String value2) {
addCriterion("`number` not between", value1, value2, "number");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("`name` is null");
return (Criteria) this;

2
src/main/java/club/joylink/rtss/entity/DraftMapWithBLOBs.java
View File

@ -52,7 +52,6 @@ public class DraftMapWithBLOBs extends DraftMap implements Serializable {
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getAuthorId() == null ? other.getAuthorId() == null : this.getAuthorId().equals(other.getAuthorId()))
&& (this.getLineCode() == null ? other.getLineCode() == null : this.getLineCode().equals(other.getLineCode()))
&& (this.getDrawWay() == null ? other.getDrawWay() == null : this.getDrawWay().equals(other.getDrawWay()))
&& (this.getGraphData() == null ? other.getGraphData() == null : this.getGraphData().equals(other.getGraphData()))
&& (this.getLogicData() == null ? other.getLogicData() == null : this.getLogicData().equals(other.getLogicData()));
}
@ -66,7 +65,6 @@ public class DraftMapWithBLOBs extends DraftMap implements Serializable {
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getAuthorId() == null) ? 0 : getAuthorId().hashCode());
result = prime * result + ((getLineCode() == null) ? 0 : getLineCode().hashCode());
result = prime * result + ((getDrawWay() == null) ? 0 : getDrawWay().hashCode());
result = prime * result + ((getGraphData() == null) ? 0 : getGraphData().hashCode());
result = prime * result + ((getLogicData() == null) ? 0 : getLogicData().hashCode());
return result;

18
src/main/java/club/joylink/rtss/entity/ExamDefinition.java
View File

@ -4,12 +4,17 @@ import java.io.Serializable;
import java.time.LocalDateTime;
/**
* exam_definition
* @author
* 考试定义表
*/
public class ExamDefinition implements Serializable {
private Long id;
/**
* 地图id
*/
private Long mapId;
/**
* 所属课程ID
*/
@ -85,6 +90,14 @@ public class ExamDefinition implements Serializable {
this.id = id;
}
public Long getMapId() {
return mapId;
}
public void setMapId(Long mapId) {
this.mapId = mapId;
}
public Long getLessonId() {
return lessonId;
}
@ -202,6 +215,7 @@ public class ExamDefinition implements Serializable {
}
ExamDefinition other = (ExamDefinition) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getMapId() == null ? other.getMapId() == null : this.getMapId().equals(other.getMapId()))
&& (this.getLessonId() == null ? other.getLessonId() == null : this.getLessonId().equals(other.getLessonId()))
&& (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
@ -222,6 +236,7 @@ public class ExamDefinition implements Serializable {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getMapId() == null) ? 0 : getMapId().hashCode());
result = prime * result + ((getLessonId() == null) ? 0 : getLessonId().hashCode());
result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
@ -245,6 +260,7 @@ public class ExamDefinition implements Serializable {
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", mapId=").append(mapId);
sb.append(", lessonId=").append(lessonId);
sb.append(", name=").append(name);
sb.append(", type=").append(type);

60
src/main/java/club/joylink/rtss/entity/ExamDefinitionExample.java
View File

@ -185,6 +185,66 @@ public class ExamDefinitionExample {
return (Criteria) this;
}
public Criteria andMapIdIsNull() {
addCriterion("map_id is null");
return (Criteria) this;
}
public Criteria andMapIdIsNotNull() {
addCriterion("map_id is not null");
return (Criteria) this;
}
public Criteria andMapIdEqualTo(Long value) {
addCriterion("map_id =", value, "mapId");
return (Criteria) this;
}
public Criteria andMapIdNotEqualTo(Long value) {
addCriterion("map_id <>", value, "mapId");
return (Criteria) this;
}
public Criteria andMapIdGreaterThan(Long value) {
addCriterion("map_id >", value, "mapId");
return (Criteria) this;
}
public Criteria andMapIdGreaterThanOrEqualTo(Long value) {
addCriterion("map_id >=", value, "mapId");
return (Criteria) this;
}
public Criteria andMapIdLessThan(Long value) {
addCriterion("map_id <", value, "mapId");
return (Criteria) this;
}
public Criteria andMapIdLessThanOrEqualTo(Long value) {
addCriterion("map_id <=", value, "mapId");
return (Criteria) this;
}
public Criteria andMapIdIn(List<Long> values) {
addCriterion("map_id in", values, "mapId");
return (Criteria) this;
}
public Criteria andMapIdNotIn(List<Long> values) {
addCriterion("map_id not in", values, "mapId");
return (Criteria) this;
}
public Criteria andMapIdBetween(Long value1, Long value2) {
addCriterion("map_id between", value1, value2, "mapId");
return (Criteria) this;
}
public Criteria andMapIdNotBetween(Long value1, Long value2) {
addCriterion("map_id not between", value1, value2, "mapId");
return (Criteria) this;
}
public Criteria andLessonIdIsNull() {
addCriterion("lesson_id is null");
return (Criteria) this;

20
src/main/java/club/joylink/rtss/entity/LearnComment.java
View File

@ -4,8 +4,8 @@ import java.io.Serializable;
import java.time.LocalDateTime;
/**
* learn_comment
* @author
* 学习吧-回复
*/
public class LearnComment implements Serializable {
private Long id;
@ -50,6 +50,11 @@ public class LearnComment implements Serializable {
*/
private Integer unlike;
/**
* 给成都工业临时加的
*/
private String userName;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -124,6 +129,14 @@ public class LearnComment implements Serializable {
this.unlike = unlike;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
@Override
public boolean equals(Object that) {
if (this == that) {
@ -144,7 +157,8 @@ public class LearnComment implements Serializable {
&& (this.getRootId() == null ? other.getRootId() == null : this.getRootId().equals(other.getRootId()))
&& (this.getParentId() == null ? other.getParentId() == null : this.getParentId().equals(other.getParentId()))
&& (this.getLike() == null ? other.getLike() == null : this.getLike().equals(other.getLike()))
&& (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()));
&& (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()))
&& (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()));
}
@Override
@ -160,6 +174,7 @@ public class LearnComment implements Serializable {
result = prime * result + ((getParentId() == null) ? 0 : getParentId().hashCode());
result = prime * result + ((getLike() == null) ? 0 : getLike().hashCode());
result = prime * result + ((getUnlike() == null) ? 0 : getUnlike().hashCode());
result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
return result;
}
@ -178,6 +193,7 @@ public class LearnComment implements Serializable {
sb.append(", parentId=").append(parentId);
sb.append(", like=").append(like);
sb.append(", unlike=").append(unlike);
sb.append(", userName=").append(userName);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

70
src/main/java/club/joylink/rtss/entity/LearnCommentExample.java
View File

@ -674,6 +674,76 @@ public class LearnCommentExample {
addCriterion("unlike not between", value1, value2, "unlike");
return (Criteria) this;
}
public Criteria andUserNameIsNull() {
addCriterion("user_name is null");
return (Criteria) this;
}
public Criteria andUserNameIsNotNull() {
addCriterion("user_name is not null");
return (Criteria) this;
}
public Criteria andUserNameEqualTo(String value) {
addCriterion("user_name =", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotEqualTo(String value) {
addCriterion("user_name <>", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThan(String value) {
addCriterion("user_name >", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThanOrEqualTo(String value) {
addCriterion("user_name >=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThan(String value) {
addCriterion("user_name <", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThanOrEqualTo(String value) {
addCriterion("user_name <=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLike(String value) {
addCriterion("user_name like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotLike(String value) {
addCriterion("user_name not like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameIn(List<String> values) {
addCriterion("user_name in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotIn(List<String> values) {
addCriterion("user_name not in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameBetween(String value1, String value2) {
addCriterion("user_name between", value1, value2, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotBetween(String value1, String value2) {
addCriterion("user_name not between", value1, value2, "userName");
return (Criteria) this;
}
}
/**

52
src/main/java/club/joylink/rtss/entity/LearnMessage.java
View File

@ -4,8 +4,8 @@ import java.io.Serializable;
import java.time.LocalDateTime;
/**
* learn_message
* @author
* 帖子留言
*/
public class LearnMessage implements Serializable {
private Long id;
@ -35,11 +35,26 @@ public class LearnMessage implements Serializable {
*/
private LocalDateTime createTime;
/**
* 赞数
*/
private Integer like;
/**
* 踩数
*/
private Integer unlike;
/**
* 是否置顶
*/
private Boolean topping;
/**
* 给成都工业临时加的
*/
private String userName;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -90,6 +105,22 @@ public class LearnMessage implements Serializable {
this.createTime = createTime;
}
public Integer getLike() {
return like;
}
public void setLike(Integer like) {
this.like = like;
}
public Integer getUnlike() {
return unlike;
}
public void setUnlike(Integer unlike) {
this.unlike = unlike;
}
public Boolean getTopping() {
return topping;
}
@ -98,6 +129,14 @@ public class LearnMessage implements Serializable {
this.topping = topping;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
@Override
public boolean equals(Object that) {
if (this == that) {
@ -116,7 +155,10 @@ public class LearnMessage implements Serializable {
&& (this.getPictureUrls() == null ? other.getPictureUrls() == null : this.getPictureUrls().equals(other.getPictureUrls()))
&& (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getTopping() == null ? other.getTopping() == null : this.getTopping().equals(other.getTopping()));
&& (this.getLike() == null ? other.getLike() == null : this.getLike().equals(other.getLike()))
&& (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()))
&& (this.getTopping() == null ? other.getTopping() == null : this.getTopping().equals(other.getTopping()))
&& (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()));
}
@Override
@ -129,7 +171,10 @@ public class LearnMessage implements Serializable {
result = prime * result + ((getPictureUrls() == null) ? 0 : getPictureUrls().hashCode());
result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getLike() == null) ? 0 : getLike().hashCode());
result = prime * result + ((getUnlike() == null) ? 0 : getUnlike().hashCode());
result = prime * result + ((getTopping() == null) ? 0 : getTopping().hashCode());
result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
return result;
}
@ -145,7 +190,10 @@ public class LearnMessage implements Serializable {
sb.append(", pictureUrls=").append(pictureUrls);
sb.append(", creatorId=").append(creatorId);
sb.append(", createTime=").append(createTime);
sb.append(", like=").append(like);
sb.append(", unlike=").append(unlike);
sb.append(", topping=").append(topping);
sb.append(", userName=").append(userName);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

190
src/main/java/club/joylink/rtss/entity/LearnMessageExample.java
View File

@ -505,6 +505,126 @@ public class LearnMessageExample {
return (Criteria) this;
}
public Criteria andLikeIsNull() {
addCriterion("`like` is null");
return (Criteria) this;
}
public Criteria andLikeIsNotNull() {
addCriterion("`like` is not null");
return (Criteria) this;
}
public Criteria andLikeEqualTo(Integer value) {
addCriterion("`like` =", value, "like");
return (Criteria) this;
}
public Criteria andLikeNotEqualTo(Integer value) {
addCriterion("`like` <>", value, "like");
return (Criteria) this;
}
public Criteria andLikeGreaterThan(Integer value) {
addCriterion("`like` >", value, "like");
return (Criteria) this;
}
public Criteria andLikeGreaterThanOrEqualTo(Integer value) {
addCriterion("`like` >=", value, "like");
return (Criteria) this;
}
public Criteria andLikeLessThan(Integer value) {
addCriterion("`like` <", value, "like");
return (Criteria) this;
}
public Criteria andLikeLessThanOrEqualTo(Integer value) {
addCriterion("`like` <=", value, "like");
return (Criteria) this;
}
public Criteria andLikeIn(List<Integer> values) {
addCriterion("`like` in", values, "like");
return (Criteria) this;
}
public Criteria andLikeNotIn(List<Integer> values) {
addCriterion("`like` not in", values, "like");
return (Criteria) this;
}
public Criteria andLikeBetween(Integer value1, Integer value2) {
addCriterion("`like` between", value1, value2, "like");
return (Criteria) this;
}
public Criteria andLikeNotBetween(Integer value1, Integer value2) {
addCriterion("`like` not between", value1, value2, "like");
return (Criteria) this;
}
public Criteria andUnlikeIsNull() {
addCriterion("unlike is null");
return (Criteria) this;
}
public Criteria andUnlikeIsNotNull() {
addCriterion("unlike is not null");
return (Criteria) this;
}
public Criteria andUnlikeEqualTo(Integer value) {
addCriterion("unlike =", value, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeNotEqualTo(Integer value) {
addCriterion("unlike <>", value, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeGreaterThan(Integer value) {
addCriterion("unlike >", value, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeGreaterThanOrEqualTo(Integer value) {
addCriterion("unlike >=", value, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeLessThan(Integer value) {
addCriterion("unlike <", value, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeLessThanOrEqualTo(Integer value) {
addCriterion("unlike <=", value, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeIn(List<Integer> values) {
addCriterion("unlike in", values, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeNotIn(List<Integer> values) {
addCriterion("unlike not in", values, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeBetween(Integer value1, Integer value2) {
addCriterion("unlike between", value1, value2, "unlike");
return (Criteria) this;
}
public Criteria andUnlikeNotBetween(Integer value1, Integer value2) {
addCriterion("unlike not between", value1, value2, "unlike");
return (Criteria) this;
}
public Criteria andToppingIsNull() {
addCriterion("topping is null");
return (Criteria) this;
@ -564,6 +684,76 @@ public class LearnMessageExample {
addCriterion("topping not between", value1, value2, "topping");
return (Criteria) this;
}
public Criteria andUserNameIsNull() {
addCriterion("user_name is null");
return (Criteria) this;
}
public Criteria andUserNameIsNotNull() {
addCriterion("user_name is not null");
return (Criteria) this;
}
public Criteria andUserNameEqualTo(String value) {
addCriterion("user_name =", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotEqualTo(String value) {
addCriterion("user_name <>", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThan(String value) {
addCriterion("user_name >", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThanOrEqualTo(String value) {
addCriterion("user_name >=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThan(String value) {
addCriterion("user_name <", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThanOrEqualTo(String value) {
addCriterion("user_name <=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLike(String value) {
addCriterion("user_name like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotLike(String value) {
addCriterion("user_name not like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameIn(List<String> values) {
addCriterion("user_name in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotIn(List<String> values) {
addCriterion("user_name not in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameBetween(String value1, String value2) {
addCriterion("user_name between", value1, value2, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotBetween(String value1, String value2) {
addCriterion("user_name not between", value1, value2, "userName");
return (Criteria) this;
}
}
/**

89
src/main/java/club/joylink/rtss/entity/LearnMessageWithBLOBs.java
View File

@ -1,89 +0,0 @@
package club.joylink.rtss.entity;
import java.io.Serializable;
/**
* learn_message
* @author
*/
public class LearnMessageWithBLOBs extends LearnMessage implements Serializable {
/**
* 点赞的用户id
*/
private String like;
/**
* 点踩的用户id
*/
private String unlike;
private static final long serialVersionUID = 1L;
public String getLike() {
return like;
}
public void setLike(String like) {
this.like = like;
}
public String getUnlike() {
return unlike;
}
public void setUnlike(String unlike) {
this.unlike = unlike;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
LearnMessageWithBLOBs other = (LearnMessageWithBLOBs) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getPostId() == null ? other.getPostId() == null : this.getPostId().equals(other.getPostId()))
&& (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent()))
&& (this.getPictureUrls() == null ? other.getPictureUrls() == null : this.getPictureUrls().equals(other.getPictureUrls()))
&& (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getTopping() == null ? other.getTopping() == null : this.getTopping().equals(other.getTopping()))
&& (this.getLike() == null ? other.getLike() == null : this.getLike().equals(other.getLike()))
&& (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getPostId() == null) ? 0 : getPostId().hashCode());
result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode());
result = prime * result + ((getPictureUrls() == null) ? 0 : getPictureUrls().hashCode());
result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getTopping() == null) ? 0 : getTopping().hashCode());
result = prime * result + ((getLike() == null) ? 0 : getLike().hashCode());
result = prime * result + ((getUnlike() == null) ? 0 : getUnlike().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", like=").append(like);
sb.append(", unlike=").append(unlike);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

46
src/main/java/club/joylink/rtss/entity/Lesson3d.java Normal file
View File

@ -0,0 +1,46 @@
package club.joylink.rtss.entity;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* @author
* 单机三维教学任务表
*/
@Data
public class Lesson3d implements Serializable {
private Long id;
/**
* 三维任务名称
*/
private String name;
/**
* 任务所属类型
*/
private String type;
/**
* 状态
*/
private String state;
/**
* 创建人id
*/
private Long userId;
private LocalDateTime createTime;
private LocalDateTime updateTime;
/**
* 任务步骤数据
*/
private String data;
private static final long serialVersionUID = 1L;
}

196
src/main/java/club/joylink/rtss/entity/CompanyExample.java → src/main/java/club/joylink/rtss/entity/Lesson3dExample.java
View File

@ -4,7 +4,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
public class CompanyExample {
public class Lesson3dExample {
protected String orderByClause;
protected boolean distinct;
@ -15,7 +15,7 @@ public class CompanyExample {
private Long offset;
public CompanyExample() {
public Lesson3dExample() {
oredCriteria = new ArrayList<Criteria>();
}
@ -135,52 +135,52 @@ public class CompanyExample {
return (Criteria) this;
}
public Criteria andIdEqualTo(Integer value) {
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Integer value) {
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Integer value) {
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Integer value) {
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Integer value) {
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Integer value) {
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Integer> values) {
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> values) {
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Integer value1, Integer value2) {
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Integer value1, Integer value2) {
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
@ -255,143 +255,203 @@ public class CompanyExample {
return (Criteria) this;
}
public Criteria andAddressIsNull() {
addCriterion("address is null");
public Criteria andTypeIsNull() {
addCriterion("`type` is null");
return (Criteria) this;
}
public Criteria andAddressIsNotNull() {
addCriterion("address is not null");
public Criteria andTypeIsNotNull() {
addCriterion("`type` is not null");
return (Criteria) this;
}
public Criteria andAddressEqualTo(String value) {
addCriterion("address =", value, "address");
public Criteria andTypeEqualTo(String value) {
addCriterion("`type` =", value, "type");
return (Criteria) this;
}
public Criteria andAddressNotEqualTo(String value) {
addCriterion("address <>", value, "address");
public Criteria andTypeNotEqualTo(String value) {
addCriterion("`type` <>", value, "type");
return (Criteria) this;
}
public Criteria andAddressGreaterThan(String value) {
addCriterion("address >", value, "address");
public Criteria andTypeGreaterThan(String value) {
addCriterion("`type` >", value, "type");
return (Criteria) this;
}
public Criteria andAddressGreaterThanOrEqualTo(String value) {
addCriterion("address >=", value, "address");
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("`type` >=", value, "type");
return (Criteria) this;
}
public Criteria andAddressLessThan(String value) {
addCriterion("address <", value, "address");
public Criteria andTypeLessThan(String value) {
addCriterion("`type` <", value, "type");
return (Criteria) this;
}
public Criteria andAddressLessThanOrEqualTo(String value) {
addCriterion("address <=", value, "address");
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("`type` <=", value, "type");
return (Criteria) this;
}
public Criteria andAddressLike(String value) {
addCriterion("address like", value, "address");
public Criteria andTypeLike(String value) {
addCriterion("`type` like", value, "type");
return (Criteria) this;
}
public Criteria andAddressNotLike(String value) {
addCriterion("address not like", value, "address");
public Criteria andTypeNotLike(String value) {
addCriterion("`type` not like", value, "type");
return (Criteria) this;
}
public Criteria andAddressIn(List<String> values) {
addCriterion("address in", values, "address");
public Criteria andTypeIn(List<String> values) {
addCriterion("`type` in", values, "type");
return (Criteria) this;
}
public Criteria andAddressNotIn(List<String> values) {
addCriterion("address not in", values, "address");
public Criteria andTypeNotIn(List<String> values) {
addCriterion("`type` not in", values, "type");
return (Criteria) this;
}
public Criteria andAddressBetween(String value1, String value2) {
addCriterion("address between", value1, value2, "address");
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("`type` between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andAddressNotBetween(String value1, String value2) {
addCriterion("address not between", value1, value2, "address");
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("`type` not between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andPhoneIsNull() {
addCriterion("phone is null");
public Criteria andStateIsNull() {
addCriterion("`state` is null");
return (Criteria) this;
}
public Criteria andPhoneIsNotNull() {
addCriterion("phone is not null");
public Criteria andStateIsNotNull() {
addCriterion("`state` is not null");
return (Criteria) this;
}
public Criteria andPhoneEqualTo(String value) {
addCriterion("phone =", value, "phone");
public Criteria andStateEqualTo(String value) {
addCriterion("`state` =", value, "state");
return (Criteria) this;
}
public Criteria andPhoneNotEqualTo(String value) {
addCriterion("phone <>", value, "phone");
public Criteria andStateNotEqualTo(String value) {
addCriterion("`state` <>", value, "state");
return (Criteria) this;
}
public Criteria andPhoneGreaterThan(String value) {
addCriterion("phone >", value, "phone");
public Criteria andStateGreaterThan(String value) {
addCriterion("`state` >", value, "state");
return (Criteria) this;
}
public Criteria andPhoneGreaterThanOrEqualTo(String value) {
addCriterion("phone >=", value, "phone");
public Criteria andStateGreaterThanOrEqualTo(String value) {
addCriterion("`state` >=", value, "state");
return (Criteria) this;
}
public Criteria andPhoneLessThan(String value) {
addCriterion("phone <", value, "phone");
public Criteria andStateLessThan(String value) {
addCriterion("`state` <", value, "state");
return (Criteria) this;
}
public Criteria andPhoneLessThanOrEqualTo(String value) {
addCriterion("phone <=", value, "phone");
public Criteria andStateLessThanOrEqualTo(String value) {
addCriterion("`state` <=", value, "state");
return (Criteria) this;
}
public Criteria andPhoneLike(String value) {
addCriterion("phone like", value, "phone");
public Criteria andStateLike(String value) {
addCriterion("`state` like", value, "state");
return (Criteria) this;
}
public Criteria andPhoneNotLike(String value) {
addCriterion("phone not like", value, "phone");
public Criteria andStateNotLike(String value) {
addCriterion("`state` not like", value, "state");
return (Criteria) this;
}
public Criteria andPhoneIn(List<String> values) {
addCriterion("phone in", values, "phone");
public Criteria andStateIn(List<String> values) {
addCriterion("`state` in", values, "state");
return (Criteria) this;
}
public Criteria andPhoneNotIn(List<String> values) {
addCriterion("phone not in", values, "phone");
public Criteria andStateNotIn(List<String> values) {
addCriterion("`state` not in", values, "state");
return (Criteria) this;
}
public Criteria andPhoneBetween(String value1, String value2) {
addCriterion("phone between", value1, value2, "phone");
public Criteria andStateBetween(String value1, String value2) {
addCriterion("`state` between", value1, value2, "state");
return (Criteria) this;
}
public Criteria andPhoneNotBetween(String value1, String value2) {
addCriterion("phone not between", value1, value2, "phone");
public Criteria andStateNotBetween(String value1, String value2) {
addCriterion("`state` not between", value1, value2, "state");
return (Criteria) this;
}
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}

54
src/main/java/club/joylink/rtss/entity/LsLesson.java
View File

@ -4,8 +4,8 @@ import java.io.Serializable;
import java.time.LocalDateTime;
/**
* ls_lesson
* @author
* 课程表
*/
public class LsLesson implements Serializable {
private Long id;
@ -15,6 +15,11 @@ public class LsLesson implements Serializable {
*/
private Long mapId;
/**
* 产品编码
*/
private Long prdId;
/**
* 产品类型
*/
@ -45,16 +50,16 @@ public class LsLesson implements Serializable {
*/
private Long creatorId;
/**
* 所属城市编号：数据字典值
*/
private String cityCode;
/**
* 状态：上线/下线
*/
private String status;
/**
* 默认课程
*/
private Boolean sysfault;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -73,6 +78,14 @@ public class LsLesson implements Serializable {
this.mapId = mapId;
}
public Long getPrdId() {
return prdId;
}
public void setPrdId(Long prdId) {
this.prdId = prdId;
}
public String getPrdType() {
return prdType;
}
@ -121,14 +134,6 @@ public class LsLesson implements Serializable {
this.creatorId = creatorId;
}
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
public String getStatus() {
return status;
}
@ -137,6 +142,14 @@ public class LsLesson implements Serializable {
this.status = status;
}
public Boolean getSysfault() {
return sysfault;
}
public void setSysfault(Boolean sysfault) {
this.sysfault = sysfault;
}
@Override
public boolean equals(Object that) {
if (this == that) {
@ -151,14 +164,15 @@ public class LsLesson implements Serializable {
LsLesson other = (LsLesson) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getMapId() == null ? other.getMapId() == null : this.getMapId().equals(other.getMapId()))
&& (this.getPrdId() == null ? other.getPrdId() == null : this.getPrdId().equals(other.getPrdId()))
&& (this.getPrdType() == null ? other.getPrdType() == null : this.getPrdType().equals(other.getPrdType()))
&& (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
&& (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks()))
&& (this.getAuthorId() == null ? other.getAuthorId() == null : this.getAuthorId().equals(other.getAuthorId()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
&& (this.getCityCode() == null ? other.getCityCode() == null : this.getCityCode().equals(other.getCityCode()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()));
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getSysfault() == null ? other.getSysfault() == null : this.getSysfault().equals(other.getSysfault()));
}
@Override
@ -167,14 +181,15 @@ public class LsLesson implements Serializable {
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getMapId() == null) ? 0 : getMapId().hashCode());
result = prime * result + ((getPrdId() == null) ? 0 : getPrdId().hashCode());
result = prime * result + ((getPrdType() == null) ? 0 : getPrdType().hashCode());
result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode());
result = prime * result + ((getAuthorId() == null) ? 0 : getAuthorId().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
result = prime * result + ((getCityCode() == null) ? 0 : getCityCode().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getSysfault() == null) ? 0 : getSysfault().hashCode());
return result;
}
@ -186,16 +201,17 @@ public class LsLesson implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", mapId=").append(mapId);
sb.append(", prdId=").append(prdId);
sb.append(", prdType=").append(prdType);
sb.append(", name=").append(name);
sb.append(", remarks=").append(remarks);
sb.append(", authorId=").append(authorId);
sb.append(", updateTime=").append(updateTime);
sb.append(", creatorId=").append(creatorId);
sb.append(", cityCode=").append(cityCode);
sb.append(", status=").append(status);
sb.append(", sysfault=").append(sysfault);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
}

192
src/main/java/club/joylink/rtss/entity/LsLessonExample.java
View File

@ -245,6 +245,66 @@ public class LsLessonExample {
return (Criteria) this;
}
public Criteria andPrdIdIsNull() {
addCriterion("prd_id is null");
return (Criteria) this;
}
public Criteria andPrdIdIsNotNull() {
addCriterion("prd_id is not null");
return (Criteria) this;
}
public Criteria andPrdIdEqualTo(Long value) {
addCriterion("prd_id =", value, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdNotEqualTo(Long value) {
addCriterion("prd_id <>", value, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdGreaterThan(Long value) {
addCriterion("prd_id >", value, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdGreaterThanOrEqualTo(Long value) {
addCriterion("prd_id >=", value, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdLessThan(Long value) {
addCriterion("prd_id <", value, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdLessThanOrEqualTo(Long value) {
addCriterion("prd_id <=", value, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdIn(List<Long> values) {
addCriterion("prd_id in", values, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdNotIn(List<Long> values) {
addCriterion("prd_id not in", values, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdBetween(Long value1, Long value2) {
addCriterion("prd_id between", value1, value2, "prdId");
return (Criteria) this;
}
public Criteria andPrdIdNotBetween(Long value1, Long value2) {
addCriterion("prd_id not between", value1, value2, "prdId");
return (Criteria) this;
}
public Criteria andPrdTypeIsNull() {
addCriterion("prd_type is null");
return (Criteria) this;
@ -635,76 +695,6 @@ public class LsLessonExample {
return (Criteria) this;
}
public Criteria andCityCodeIsNull() {
addCriterion("city_code is null");
return (Criteria) this;
}
public Criteria andCityCodeIsNotNull() {
addCriterion("city_code is not null");
return (Criteria) this;
}
public Criteria andCityCodeEqualTo(String value) {
addCriterion("city_code =", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeNotEqualTo(String value) {
addCriterion("city_code <>", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeGreaterThan(String value) {
addCriterion("city_code >", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeGreaterThanOrEqualTo(String value) {
addCriterion("city_code >=", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeLessThan(String value) {
addCriterion("city_code <", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeLessThanOrEqualTo(String value) {
addCriterion("city_code <=", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeLike(String value) {
addCriterion("city_code like", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeNotLike(String value) {
addCriterion("city_code not like", value, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeIn(List<String> values) {
addCriterion("city_code in", values, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeNotIn(List<String> values) {
addCriterion("city_code not in", values, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeBetween(String value1, String value2) {
addCriterion("city_code between", value1, value2, "cityCode");
return (Criteria) this;
}
public Criteria andCityCodeNotBetween(String value1, String value2) {
addCriterion("city_code not between", value1, value2, "cityCode");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`status` is null");
return (Criteria) this;
@ -774,6 +764,66 @@ public class LsLessonExample {
addCriterion("`status` not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andSysfaultIsNull() {
addCriterion("sysFault is null");
return (Criteria) this;
}
public Criteria andSysfaultIsNotNull() {
addCriterion("sysFault is not null");
return (Criteria) this;
}
public Criteria andSysfaultEqualTo(Boolean value) {
addCriterion("sysFault =", value, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultNotEqualTo(Boolean value) {
addCriterion("sysFault <>", value, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultGreaterThan(Boolean value) {
addCriterion("sysFault >", value, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultGreaterThanOrEqualTo(Boolean value) {
addCriterion("sysFault >=", value, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultLessThan(Boolean value) {
addCriterion("sysFault <", value, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultLessThanOrEqualTo(Boolean value) {
addCriterion("sysFault <=", value, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultIn(List<Boolean> values) {
addCriterion("sysFault in", values, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultNotIn(List<Boolean> values) {
addCriterion("sysFault not in", values, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultBetween(Boolean value1, Boolean value2) {
addCriterion("sysFault between", value1, value2, "sysfault");
return (Criteria) this;
}
public Criteria andSysfaultNotBetween(Boolean value1, Boolean value2) {
addCriterion("sysFault not between", value1, value2, "sysfault");
return (Criteria) this;
}
}
/**
@ -870,4 +920,4 @@ public class LsLessonExample {
this(condition, value, secondValue, null);
}
}
}
}

95
src/main/java/club/joylink/rtss/entity/MapGroup.java Normal file
View File

@ -0,0 +1,95 @@
package club.joylink.rtss.entity;
import java.io.Serializable;
/**
* map_group
* @author
*/
public class MapGroup implements Serializable {
private Long id;
private String groupName;
private String groupType;
private String mapIds;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public String getGroupType() {
return groupType;
}
public void setGroupType(String groupType) {
this.groupType = groupType;
}
public String getMapIds() {
return mapIds;
}
public void setMapIds(String mapIds) {
this.mapIds = mapIds;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
MapGroup other = (MapGroup) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getGroupName() == null ? other.getGroupName() == null : this.getGroupName().equals(other.getGroupName()))
&& (this.getGroupType() == null ? other.getGroupType() == null : this.getGroupType().equals(other.getGroupType()))
&& (this.getMapIds() == null ? other.getMapIds() == null : this.getMapIds().equals(other.getMapIds()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getGroupName() == null) ? 0 : getGroupName().hashCode());
result = prime * result + ((getGroupType() == null) ? 0 : getGroupType().hashCode());
result = prime * result + ((getMapIds() == null) ? 0 : getMapIds().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", groupName=").append(groupName);
sb.append(", groupType=").append(groupType);
sb.append(", mapIds=").append(mapIds);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

492
src/main/java/club/joylink/rtss/entity/MapGroupExample.java Normal file
View File

@ -0,0 +1,492 @@
package club.joylink.rtss.entity;
import java.util.ArrayList;
import java.util.List;
public class MapGroupExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
private Integer limit;
private Long offset;
public MapGroupExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public Integer getLimit() {
return limit;
}
public void setOffset(Long offset) {
this.offset = offset;
}
public Long getOffset() {
return offset;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andGroupNameIsNull() {
addCriterion("group_name is null");
return (Criteria) this;
}
public Criteria andGroupNameIsNotNull() {
addCriterion("group_name is not null");
return (Criteria) this;
}
public Criteria andGroupNameEqualTo(String value) {
addCriterion("group_name =", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameNotEqualTo(String value) {
addCriterion("group_name <>", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameGreaterThan(String value) {
addCriterion("group_name >", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameGreaterThanOrEqualTo(String value) {
addCriterion("group_name >=", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameLessThan(String value) {
addCriterion("group_name <", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameLessThanOrEqualTo(String value) {
addCriterion("group_name <=", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameLike(String value) {
addCriterion("group_name like", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameNotLike(String value) {
addCriterion("group_name not like", value, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameIn(List<String> values) {
addCriterion("group_name in", values, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameNotIn(List<String> values) {
addCriterion("group_name not in", values, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameBetween(String value1, String value2) {
addCriterion("group_name between", value1, value2, "groupName");
return (Criteria) this;
}
public Criteria andGroupNameNotBetween(String value1, String value2) {
addCriterion("group_name not between", value1, value2, "groupName");
return (Criteria) this;
}
public Criteria andGroupTypeIsNull() {
addCriterion("group_type is null");
return (Criteria) this;
}
public Criteria andGroupTypeIsNotNull() {
addCriterion("group_type is not null");
return (Criteria) this;
}
public Criteria andGroupTypeEqualTo(String value) {
addCriterion("group_type =", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeNotEqualTo(String value) {
addCriterion("group_type <>", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeGreaterThan(String value) {
addCriterion("group_type >", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeGreaterThanOrEqualTo(String value) {
addCriterion("group_type >=", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeLessThan(String value) {
addCriterion("group_type <", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeLessThanOrEqualTo(String value) {
addCriterion("group_type <=", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeLike(String value) {
addCriterion("group_type like", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeNotLike(String value) {
addCriterion("group_type not like", value, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeIn(List<String> values) {
addCriterion("group_type in", values, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeNotIn(List<String> values) {
addCriterion("group_type not in", values, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeBetween(String value1, String value2) {
addCriterion("group_type between", value1, value2, "groupType");
return (Criteria) this;
}
public Criteria andGroupTypeNotBetween(String value1, String value2) {
addCriterion("group_type not between", value1, value2, "groupType");
return (Criteria) this;
}
public Criteria andMapIdsIsNull() {
addCriterion("map_ids is null");
return (Criteria) this;
}
public Criteria andMapIdsIsNotNull() {
addCriterion("map_ids is not null");
return (Criteria) this;
}
public Criteria andMapIdsEqualTo(String value) {
addCriterion("map_ids =", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsNotEqualTo(String value) {
addCriterion("map_ids <>", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsGreaterThan(String value) {
addCriterion("map_ids >", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsGreaterThanOrEqualTo(String value) {
addCriterion("map_ids >=", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsLessThan(String value) {
addCriterion("map_ids <", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsLessThanOrEqualTo(String value) {
addCriterion("map_ids <=", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsLike(String value) {
addCriterion("map_ids like", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsNotLike(String value) {
addCriterion("map_ids not like", value, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsIn(List<String> values) {
addCriterion("map_ids in", values, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsNotIn(List<String> values) {
addCriterion("map_ids not in", values, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsBetween(String value1, String value2) {
addCriterion("map_ids between", value1, value2, "mapIds");
return (Criteria) this;
}
public Criteria andMapIdsNotBetween(String value1, String value2) {
addCriterion("map_ids not between", value1, value2, "mapIds");
return (Criteria) this;
}
}
/**
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

16
src/main/java/club/joylink/rtss/entity/MapInfo.java
View File

@ -39,11 +39,6 @@ public class MapInfo implements Serializable {
*/
private String projectCode;
/**
* 绘制方式-0原有；1新
*/
private Boolean drawWay;
/**
* 序号
*/
@ -112,14 +107,6 @@ public class MapInfo implements Serializable {
this.projectCode = projectCode;
}
public Boolean getDrawWay() {
return drawWay;
}
public void setDrawWay(Boolean drawWay) {
this.drawWay = drawWay;
}
public Integer getOrderNumber() {
return orderNumber;
}
@ -155,7 +142,6 @@ public class MapInfo implements Serializable {
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getProject() == null ? other.getProject() == null : this.getProject().equals(other.getProject()))
&& (this.getProjectCode() == null ? other.getProjectCode() == null : this.getProjectCode().equals(other.getProjectCode()))
&& (this.getDrawWay() == null ? other.getDrawWay() == null : this.getDrawWay().equals(other.getDrawWay()))
&& (this.getOrderNumber() == null ? other.getOrderNumber() == null : this.getOrderNumber().equals(other.getOrderNumber()))
&& (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion()));
}
@ -171,7 +157,6 @@ public class MapInfo implements Serializable {
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getProject() == null) ? 0 : getProject().hashCode());
result = prime * result + ((getProjectCode() == null) ? 0 : getProjectCode().hashCode());
result = prime * result + ((getDrawWay() == null) ? 0 : getDrawWay().hashCode());
result = prime * result + ((getOrderNumber() == null) ? 0 : getOrderNumber().hashCode());
result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode());
return result;
@ -190,7 +175,6 @@ public class MapInfo implements Serializable {
sb.append(", status=").append(status);
sb.append(", project=").append(project);
sb.append(", projectCode=").append(projectCode);
sb.append(", drawWay=").append(drawWay);
sb.append(", orderNumber=").append(orderNumber);
sb.append(", version=").append(version);
sb.append(", serialVersionUID=").append(serialVersionUID);

Some files were not shown because too many files have changed in this diff Show More