添加 model 和 mapper

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkPersonMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkPerson;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkPersonMapper extends BaseMapper<WorkPerson> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkRuleMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkRule;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkRuleMapper extends BaseMapper<WorkRule> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkShiftConflictMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkShiftConflict;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkShiftConflictMapper extends BaseMapper<WorkShiftConflict> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkShiftDurationMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkShiftDuration;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkShiftDurationMapper extends BaseMapper<WorkShiftDuration> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkShiftMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkShift;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkShiftMapper extends BaseMapper<WorkShift> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkShiftRestMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkShiftRest;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkShiftRestMapper extends BaseMapper<WorkShiftRest> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/dao/WorkTimeMapper.java

@@ -0,0 +1,10 @@
+package com.persagy.fm.scheduling.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.fm.scheduling.model.WorkTime;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkTimeMapper extends BaseMapper<WorkTime> {
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkPerson.java

@@ -0,0 +1,18 @@
+package com.persagy.fm.scheduling.model;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+@Data
+@TableName(value = "work_person")
+public class WorkPerson extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "person_id")
+    private String personId;
+    @TableField(value = "project_id")
+    private String projectId;
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkRule.java

@@ -0,0 +1,25 @@
+package com.persagy.fm.scheduling.model;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+@Data
+@TableName(value = "work_rule")
+public class WorkRule extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "")
+    private Integer type;
+    @TableField(value = "")
+    private Integer operator;
+    @TableField(value = "")
+    private double value;
+    @TableField(value = "")
+    private String validator;
+    @TableField(value = "")
+    private Integer enable;
+
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkSchedule.java

@@ -4,28 +4,20 @@ package com.persagy.fm.scheduling.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.fm.common.model.entity.AuditableEntity;
-import com.persagy.fm.scheduling.enums.WorkTimeType;
 import lombok.Data;
 
-import java.io.Serializable;
-
+import java.util.Date;
 
 @Data
 @TableName(value = "work_schedule")
-public class WorkSchedule extends AuditableEntity<WorkSchedule> implements Serializable {
+public class WorkSchedule extends AuditableEntity<WorkSchedule> {
 
-    @TableField(value = "year")
-    private Integer year;
-    @TableField(value = "month")
-    private Integer month;
-    @TableField(value = "day")
-    private Integer day;
+    @TableField(value = "workDay")
+    private Date workDay;
+    @TableField(value = "shift_id")
+    private String shiftId;
     @TableField(value = "person_id")
     private String personId;
-    @TableField(value = "department_id")
-    private String departmentId;
-    @TableField(value = "project_id")
-    private String projectId;
-    @TableField(value = "work_time_type")
-    private WorkTimeType workTimeType;
+
+
 }

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkShift.java

@@ -0,0 +1,25 @@
+package com.persagy.fm.scheduling.model;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+@Data
+@TableName(value = "work_shift")
+public class WorkShift extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "shift_abbr")
+    private String shiftAbbr;
+    @TableField(value = "shift_name")
+    private String shiftName;
+    @TableField(value = "start_time")
+    private String startTime;
+    @TableField(value = "end_time")
+    private String endTime;
+    @TableField(value = "work_duration")
+    private long workDuration;
+
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkShiftConflict.java

@@ -0,0 +1,18 @@
+package com.persagy.fm.scheduling.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+@Data
+@TableName(value = "work_shift_conflict")
+public class WorkShiftConflict extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "source_shift_id")
+    private String sourceShiftId;
+    @TableField(value = "current_shift_id")
+    private String currentShiftId;
+
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkShiftDuration.java

@@ -0,0 +1,22 @@
+package com.persagy.fm.scheduling.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName(value = "work_shift_duration")
+public class WorkShiftDuration extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "shift_id")
+    private String shiftId;
+    @TableField(value = "start_time")
+    private Date startTime;
+    @TableField(value = "end_time")
+    private Date endTime;
+
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkShiftRest.java

@@ -0,0 +1,20 @@
+package com.persagy.fm.scheduling.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+@Data
+@TableName(value = "work_shift_rest")
+public class WorkShiftRest extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "shift_id")
+    private String shiftId;
+    @TableField(value = "start_time")
+    private String startTime;
+    @TableField(value = "end_time")
+    private String endTime;
+
+
+}

fm-scheduling/src/main/java/com/persagy/fm/scheduling/model/WorkTime.java

@@ -0,0 +1,26 @@
+package com.persagy.fm.scheduling.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.persagy.fm.common.model.entity.AuditableEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName(value = "work_time")
+public class WorkTime extends AuditableEntity<WorkSchedule> {
+
+    @TableField(value = "shift_id")
+    private String shiftId;
+    @TableField(value = "person_id")
+    private String personId;
+    @TableField(value = "start_time")
+    private Date startTime;
+    @TableField(value = "end_time")
+    private Date endTime;
+    @TableField(value = "work_times")
+    private long workTimes;
+
+
+}