diff --git a/.gitignore b/.gitignore index 173454b..e2b9a9e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,10 @@ # IntelliJ project files .idea *.iml -out -gen +/wisdom_manager/wisdom_manager_service/target/ +/wisdom_manager/wisdom_manager_pojo/target/ +/wisdom_manager/wisdom_manager_dao/target/ +/wisdom_manager/wisdom_manager_interface/target/ +/wisdom_common/target/ +/wisdom_web/target/ +/.idea/ diff --git a/pom.xml b/pom.xml index 6e1aba6..20d274d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,8 @@ 1.2.15 5.1.32 1.6.4 - 1.2.57 + + 2.9.8 1.0.9 4.3.5 1.2 @@ -43,10 +44,31 @@ 5.13.0 2.3.23 2.2.2 + 1.16.6 + 3.14.1 + 3.18.2-GA + 5.1.6.RELEASE + + + + + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + + org.projectlombok + lombok + ${lombok.version} + joda-time @@ -70,11 +92,13 @@ ${commons-net.version} + - com.alibaba - fastjson - ${fastjson.version} + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + org.apache.httpcomponents @@ -92,7 +116,6 @@ junit junit ${junit.version} - test @@ -113,7 +136,7 @@ com.github.miemiedev - mybatis-paginator + mybatis-paginator ${mybatis.paginator.version} @@ -134,12 +157,16 @@ ${druid.version} + + org.springframework + spring-tx + ${springtx.version} + org.springframework spring-context ${spring.version} - org.springframework spring-beans @@ -211,6 +238,17 @@ com.alibaba dubbo ${dubbo.version} + + + javassist + org.javassist + + + + + org.javassist + javassist + ${javassist-version} org.apache.zookeeper diff --git a/wisdom_common/pom.xml b/wisdom_common/pom.xml index f53d587..4dd761b 100644 --- a/wisdom_common/pom.xml +++ b/wisdom_common/pom.xml @@ -12,6 +12,14 @@ wisdom_common + + org.projectlombok + lombok + + + com.fasterxml.jackson.core + jackson-databind + joda-time @@ -30,11 +38,6 @@ commons-net commons-net - - - com.alibaba - fastjson - org.apache.httpcomponents @@ -49,7 +52,6 @@ junit junit - test @@ -61,6 +63,12 @@ org.mybatis mybatis + + com.alibaba + fastjson + 1.2.57 + compile + \ No newline at end of file diff --git a/wisdom_common/src/main/java/com/smart/pojo/AttDiff.java b/wisdom_common/src/main/java/com/smart/pojo/AttDiff.java new file mode 100644 index 0000000..e713f47 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/AttDiff.java @@ -0,0 +1,16 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 俩个考勤区间进行划分 + */ +@Data +public class AttDiff implements Serializable { + private String thisGrade;//这次的分数 + private String thisHeadup;//这次的抬头率 + private String attDiff;//考勤分数不一样 + private String headupDiff;//抬头率不一样 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/AttendanceCourseItem.java b/wisdom_common/src/main/java/com/smart/pojo/AttendanceCourseItem.java new file mode 100644 index 0000000..4f22ef0 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/AttendanceCourseItem.java @@ -0,0 +1,24 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 这节课的考勤状况 + * @author LM_Code + * @create 2019-05-19-15:03 + */ +@Data +public class AttendanceCourseItem implements Serializable { + String attendance_id;//考勤id + String courseitem_id;//这节课的id + String student_id;//学生id + String student_name;//学生姓名 + String create_date;//上课时间 + String status;//到勤状态 + String head_up_rate;//抬头率 + String headup_score;//抬头分数 + String goal;//总分 + String sleep;//睡觉状态 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/AttendanceItem.java b/wisdom_common/src/main/java/com/smart/pojo/AttendanceItem.java new file mode 100644 index 0000000..55d4c8f --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/AttendanceItem.java @@ -0,0 +1,29 @@ +package com.smart.pojo; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author LM_Code + * @create 2019-05-09-20:45 + */ +@Data +public class AttendanceItem implements Serializable { + String attendance_id;//考勤id + String courseitem_id;//这一节课的id + String course_id;//课程id + String name;//课程名 + Date time;//上课时间 + String status;//到勤状态 + String head_up_rate;//抬头率 + String goal;//总分 + String teacher_id;//老师id + String teacher_name;//老师姓名 + String classroom_id;//教室id + String course_note;//课程note + String student_id;//学生id + String student_name;//学生名 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/AttendanceSituation.java b/wisdom_common/src/main/java/com/smart/pojo/AttendanceSituation.java new file mode 100644 index 0000000..129d01d --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/AttendanceSituation.java @@ -0,0 +1,17 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author LM_Code + * @create 2019-05-18-15:59 + */ +@Data +public class AttendanceSituation implements Serializable { + String student_id;//学生id + String name;//学生姓名 + String create_date;//考勤日期 + String courseitem_id;//考勤的那节课 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/CheckAttendance.java b/wisdom_common/src/main/java/com/smart/pojo/CheckAttendance.java new file mode 100644 index 0000000..e82f37c --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/CheckAttendance.java @@ -0,0 +1,23 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 查看今天有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + * @author LM_Code + * @create 2019-05-19-10:23 + */ +@Data +public class CheckAttendance implements Serializable { + String courseitem_id;//这节课的id + String courseitem_name;//课程名 + int number;//人数 + String avg_goal;//这节课平均分数 + String avg_head_up_rate;//这节课平均抬头率 + String avg_headup_score;//抬头平均分 + int absent_num;//这节课缺勤人数 + int sleep_num;//这节课睡觉人数 + String create_date;//这节课上课时间 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/CheckAttendanceStatistic.java b/wisdom_common/src/main/java/com/smart/pojo/CheckAttendanceStatistic.java new file mode 100644 index 0000000..c750361 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/CheckAttendanceStatistic.java @@ -0,0 +1,78 @@ +package com.smart.pojo; + +import com.smart.utils.DateUtils; +import lombok.Data; +import org.joda.time.DateTime; + +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.Date; +import java.util.List; + +/** + * 对每天的考勤进行分装 + */ +@Data +public class CheckAttendanceStatistic implements Serializable { + List checkAttendanceList;//这一天的考勤list + String date;//日期 + int headcount;//总人数 + int sleepNum = 0;//睡觉人数 + int absentNum;//缺勤人数 + double sleepRate;//睡觉百分比 + double sbsentRate;//缺勤率 + double ToOftenRate;//到勤率 + double attGoalAve;//考勤平均分 + double headupGoalAue;//抬头率分数 + double headUpAve;//抬头率平均分 + public CheckAttendanceStatistic(){} + public CheckAttendanceStatistic(List list){ + this.checkAttendanceList = list; + headcount = 0 ;//总人数 + sleepNum = 0;//睡觉人数 + absentNum = 0;//缺勤人数 + sleepRate = 0;//睡觉百分比 + sbsentRate = 0;//缺勤率 + ToOftenRate = 0;//到勤率 + attGoalAve = 0;//考勤平均分 + headupGoalAue = 0;//抬头率分数 + headUpAve = 0;//抬头率平均分 + //获取今天有几节课 + int num = list.size(); + for (CheckAttendance attendance : list) { + //计算睡觉的人数 + sleepNum += attendance.getSleep_num(); + //计算一共多少人 + headcount += attendance.getNumber(); + //计算缺勤的人数 + absentNum += attendance.getAbsent_num(); + //先算出总分 + attGoalAve += Double.parseDouble(attendance.getAvg_goal()); + headupGoalAue += Double.parseDouble(attendance.getAvg_headup_score()); + headUpAve += Double.parseDouble(attendance.getAvg_head_up_rate()); + //计算出日期 + + DateTime dateTime = DateUtils.stringToDatetime(attendance.create_date); + this.date = dateTime.toString("yyyy-MM-dd"); + } + if (num == 0) + num = 1; + if(headcount == 0) + headcount = 1; + //计算抬头率、抬头率平均分、考勤平均分 + headUpAve /= num; + headupGoalAue /= num; + attGoalAve /= num; + //计算几率 + sleepRate = (double)sleepNum / (double)headcount; + sbsentRate = (double) absentNum/(double)headcount; + ToOftenRate = 1-sbsentRate; + //对double进行格式化 + sleepRate = Double.parseDouble(new DecimalFormat("0.0000").format(sleepRate)); + sbsentRate = Double.parseDouble(new DecimalFormat("0.0000").format(sbsentRate)); + ToOftenRate = Double.parseDouble(new DecimalFormat("0.0000").format(ToOftenRate)); + attGoalAve = Double.parseDouble(new DecimalFormat("0.00").format(attGoalAve)); + headupGoalAue = Double.parseDouble(new DecimalFormat("0.00").format(headupGoalAue)); + headUpAve = Double.parseDouble(new DecimalFormat("0.0000").format(headUpAve)); + } +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/CourseAVGAttendance.java b/wisdom_common/src/main/java/com/smart/pojo/CourseAVGAttendance.java new file mode 100644 index 0000000..979ceae --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/CourseAVGAttendance.java @@ -0,0 +1,27 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 某同学某个课程的平均考勤情况 + * @author LM_Code + * @create 2019-05-19-15:35 + */ +@Data +public class CourseAVGAttendance implements Serializable { + String student_id;//学生id + String name;//学生姓名 + String course_id;//课程id + String course_name;//课程名称 + String total;//课程上的次数 + String leave_num;//请假次数 + String late_num;//迟到次数 + String absent_num;//缺勤次数 + String attend_num;//正常到勤次数 + String sleep_num;//睡觉次数 + String avg_head_up_rate;//平均抬头率 + String avg_headup_score;//平均抬头分数 + String avg_goal;//平均总分 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/CurrentTime.java b/wisdom_common/src/main/java/com/smart/pojo/CurrentTime.java new file mode 100644 index 0000000..d622dd5 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/CurrentTime.java @@ -0,0 +1,23 @@ +package com.smart.pojo; + +import org.joda.time.DateTime; + +import java.io.Serializable; + +/** + * 时间类，推算与今天有关的时间信息 + */ +public class CurrentTime implements Serializable { + private DateTime now; //当前时间 + + //构造函数 + public CurrentTime() { + now = new DateTime(); + } + + + + + + +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/DaysAttendanceCollect.java b/wisdom_common/src/main/java/com/smart/pojo/DaysAttendanceCollect.java new file mode 100644 index 0000000..7a7c4bc --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/DaysAttendanceCollect.java @@ -0,0 +1,20 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 每天的考勤汇总 + * @author LM_Code + * @create 2019-05-13-21:16 + */ +@Data +public class DaysAttendanceCollect implements Serializable { + Date date;//日期 + String sum;//总课程数 + String avg_head_up_rate;//平均抬头率 + String avg_head_up_score;//平均抬头分数 + String avgGoal;//平均考勤分 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/DaysAttendanceCollectStatistic.java b/wisdom_common/src/main/java/com/smart/pojo/DaysAttendanceCollectStatistic.java new file mode 100644 index 0000000..80f6f54 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/DaysAttendanceCollectStatistic.java @@ -0,0 +1,52 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.List; + +/** + * 存放每一天的考勤信息+这里面每一天的考勤信息的平均值 + */ +@Data +public class DaysAttendanceCollectStatistic implements Serializable { + String startTime;//开始时间 + String endTime;//结束时间 + int num;//天数 + String headUpRateAverage;//抬头率平均值 + String AttendanceGoalAverage;//平均考勤得分 + List list;//这里面存放的是每一天的考勤信息 + + /** + * 无参构造 + */ + public DaysAttendanceCollectStatistic(){ + + } + + /** + * 有参构造 + * @param num 中间间隔多少天 + * @param list 每一天的大致考勤 + */ + public DaysAttendanceCollectStatistic(int num,List list) { + this.list = list; + this.num = num+1; + //在这里计算出平均值 + double headUpTotal = 0; + double AttendanceGoalTotal = 0; + for (DaysAttendanceCollect daysAttendanceCollect : list) { + AttendanceGoalTotal += Double.parseDouble(daysAttendanceCollect.avgGoal); + headUpTotal += Double.parseDouble(daysAttendanceCollect.avg_head_up_rate); + } + if (this.AttendanceGoalAverage != null || this.headUpRateAverage != null){ + //计算出考勤的平均值 + this.AttendanceGoalAverage = new DecimalFormat("0.0").format(AttendanceGoalTotal/num); + this.headUpRateAverage = new DecimalFormat("0.0").format(headUpTotal/num); + }else { + this.AttendanceGoalAverage = "0"; + this.headUpRateAverage = "0"; + } + } +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/RequestLogin.java b/wisdom_common/src/main/java/com/smart/pojo/RequestLogin.java new file mode 100644 index 0000000..035115f --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/RequestLogin.java @@ -0,0 +1,15 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 接受登陆参数的类 + */ +@Data +public class RequestLogin implements Serializable { + private String account; //账号 + private String password; //密码 + private int status; //1为学生，2为老师 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/ServiceMsg.java b/wisdom_common/src/main/java/com/smart/pojo/ServiceMsg.java new file mode 100644 index 0000000..411a0d3 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/ServiceMsg.java @@ -0,0 +1,21 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ServiceMsg implements Serializable { + String id; + String status; + String msg; + + public ServiceMsg(){} + + + public ServiceMsg(String id , String status , String msg){ + this.id = id; + this.status = status; + this.msg = msg; + } +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/StageAttendanceCollect.java b/wisdom_common/src/main/java/com/smart/pojo/StageAttendanceCollect.java new file mode 100644 index 0000000..e856ebd --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/StageAttendanceCollect.java @@ -0,0 +1,21 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author LM_Code + * @create 2019-05-14-19:45 + */ +@Data +public class StageAttendanceCollect implements Serializable { + String avg_head_up_rate; + String avg_goal; + String attend_times; + String late_times; + String leave_times; + String absent_times; + List attendanceItems; +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/StudentInfo.java b/wisdom_common/src/main/java/com/smart/pojo/StudentInfo.java new file mode 100644 index 0000000..5766963 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/StudentInfo.java @@ -0,0 +1,26 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author LM_Code + * @create 2019-05-08-19:34 + */ +@Data +public class StudentInfo implements Serializable { + String id;//学生id + String name;//姓名 + String sex;//性别 + String phone;//电话号 + String email;//邮件 + String picture;//头像 + String classId;//班级id + String className;//班级名 + String professionId;//专业id + String professionName;//专业名 + String collegeId;//学院id + String collegeName;//学院名 + String weixinId;//微信号 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/TeacherInfo.java b/wisdom_common/src/main/java/com/smart/pojo/TeacherInfo.java new file mode 100644 index 0000000..6d92e94 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/TeacherInfo.java @@ -0,0 +1,24 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author LM_Code + * @create 2019-05-10-19:16 + */ +@Data +public class TeacherInfo implements Serializable { + String id;//教师id + String name;//教师姓名 + String sex;//性别 + String college_id;//学院id + String college_name;//学院姓名 + String picture;//头像图片 + String wexin_id;//微信号 + String phone_code;//电话号 + String email;//邮箱 + String position_id;//职位id + String position_name;//职位名 +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/WCourseInfo.java b/wisdom_common/src/main/java/com/smart/pojo/WCourseInfo.java new file mode 100644 index 0000000..6f54dbf --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/WCourseInfo.java @@ -0,0 +1,28 @@ +package com.smart.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author LM_Code + * @create 2019-05-05-15:27 + */ +@Data +public class WCourseInfo implements Serializable { + String id; + Date time; + String courseId; + String courseName; + String courseNode; + int attendanceTotalScore; + int leaveScore; + int attendScore; + int lateAttendScore; + int headUpScore; + String classroomId; + String teacherId; + String teacherName; + +} diff --git a/wisdom_common/src/main/java/com/smart/pojo/WisdomResult.java b/wisdom_common/src/main/java/com/smart/pojo/WisdomResult.java new file mode 100644 index 0000000..277ba9f --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/pojo/WisdomResult.java @@ -0,0 +1,155 @@ +package com.smart.pojo; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.Serializable; +import java.util.List; + +/** + * + */ +public class WisdomResult implements Serializable{ + + // 定义jackson对象 + private static final ObjectMapper MAPPER = new ObjectMapper(); + + // 响应业务状态 + private Integer status; + + // 响应消息 + private String msg; + + // 响应中的数据 + private Object data; + + public static WisdomResult build(Integer status, String msg, Object data) { + return new WisdomResult(status, msg, data); + } + + public static WisdomResult ok(Object data) { + return new WisdomResult(data); + } + + public static WisdomResult ok() { + return new WisdomResult(null); + } + + public static WisdomResult errot(String msg){ + return new WisdomResult(0,msg,null); + } + + public WisdomResult() { + + } + + public static WisdomResult build(Integer status, String msg) { + return new WisdomResult(status, msg, null); + } + + public WisdomResult(Integer status, String msg, Object data) { + this.status = status; + this.msg = msg; + this.data = data; + } + + public WisdomResult(Object data) { + this.status = 1; + this.msg = "true"; + this.data = data; + } + +// public Boolean isOK() { +// return this.status == 200; +// } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + /** + * 将json结果集转化为TaotaoResult对象 + * + * @param jsonData json数据 + * @param clazz TaotaoResult中的object类型 + * @return + */ + public static WisdomResult formatToPojo(String jsonData, Class clazz) { + try { + if (clazz == null) { + return MAPPER.readValue(jsonData, WisdomResult.class); + } + JsonNode jsonNode = MAPPER.readTree(jsonData); + JsonNode data = jsonNode.get("data"); + Object obj = null; + if (clazz != null) { + if (data.isObject()) { + obj = MAPPER.readValue(data.traverse(), clazz); + } else if (data.isTextual()) { + obj = MAPPER.readValue(data.asText(), clazz); + } + } + return build(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj); + } catch (Exception e) { + return null; + } + } + + /** + * 没有object对象的转化 + * + * @param json + * @return + */ + public static WisdomResult format(String json) { + try { + return MAPPER.readValue(json, WisdomResult.class); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * Object是集合转化 + * + * @param jsonData json数据 + * @param clazz 集合中的类型 + * @return + */ + public static WisdomResult formatToList(String jsonData, Class clazz) { + try { + JsonNode jsonNode = MAPPER.readTree(jsonData); + JsonNode data = jsonNode.get("data"); + Object obj = null; + if (data.isArray() && data.size() > 0) { + obj = MAPPER.readValue(data.traverse(), + MAPPER.getTypeFactory().constructCollectionType(List.class, clazz)); + } + return build(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj); + } catch (Exception e) { + return null; + } + } + +} diff --git a/wisdom_common/src/main/java/com/smart/utils/DateUtils.java b/wisdom_common/src/main/java/com/smart/utils/DateUtils.java new file mode 100644 index 0000000..cf3c587 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/utils/DateUtils.java @@ -0,0 +1,191 @@ +package com.smart.utils; + +import com.smart.pojo.WisdomResult; +import org.joda.time.DateTime; +import org.joda.time.Period; +import org.joda.time.PeriodType; +import org.junit.Test; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 专门用来计算时间的时间类 + */ +public class DateUtils implements Serializable { + + //定义时间格式 + private String DATE_FORMAT_TOSTRING = "yyyy-MM-dd HH:mm:ss"; + /** + * 获取当前时间 + */ + public static DateTime getCurrentTime(){ + return new DateTime(); + } + + /** + * 指定日期前x月，返回该月的月初,与月末的值 + */ + public static Map subXMonthDay(DateTime dateTime , int x){ + Map map = new HashMap<>(); + //向前推x个月 + DateTime month = dateTime.minusMonths(x); + //计算该月的第一天 + map.put("start",month.dayOfMonth().withMinimumValue()); + //计算该月的最后一天 + map.put("end",month.dayOfMonth().withMaximumValue()); + //返回 + return map; + } + + /** + * 指定日期的前x个星期，返回该星期的星期数 + */ + public static Map subXWeekDay(DateTime dateTime , int x){ + Map map = new HashMap<>(); + //向前x个星期 + DateTime week = dateTime.minusWeeks(x); + //计算月初 + map.put("start",week.dayOfWeek().withMinimumValue()); + //计算月末 + map.put("end",week.dayOfWeek().withMaximumValue()); + return map; + } + + /** + * 指定日期向后推x个月，获得该月第一天与最后一天 + */ + public static Map addXMonthDay(DateTime dateTime , int x){ + Map map = new HashMap<>(); + //向前推x个月 + DateTime month = dateTime.plusMonths(x); + //计算该月的第一天 + map.put("start",month.dayOfMonth().withMinimumValue()); + //计算该月的最后一天 + map.put("end",month.dayOfMonth().withMaximumValue()); + //返回 + return map; + } + + /** + * 向后推x个星期，获取该星期第一天与最后一天 + */ + public static Map addXWeekDay(DateTime dateTime , int x){ + Map map = new HashMap<>(); + //向前x个星期 + DateTime week = dateTime.plusWeeks(x); + //计算月初 + map.put("start",week.dayOfWeek().withMinimumValue()); + //计算月末 + map.put("end",week.dayOfWeek().withMaximumValue()); + return map; + } + + /** + * 传来一个时间，将该时间转换为00：00 ---23：59 + */ + public static Map formatSpellTime(DateTime dateTime){ + return formatSpellTime(dateTime,dateTime); + } + + /** + * 传来一个时间段，将该时间段转化为起始时间00：00----末尾时间+1天的00：00 + */ + public static Map formatSpellTime(DateTime begin,DateTime end) { + Map map = new HashMap<>(); + //0点 + DateTime beginDay = new DateTime(begin.getYear(), begin.getMonthOfYear(), begin.getDayOfMonth() + , 0, 0); + //第二天0点 + DateTime tomorrow = end.plusDays(1); + DateTime tomorrowDay = new DateTime(tomorrow.getYear(), tomorrow.getMonthOfYear(), tomorrow.getDayOfMonth() + , 0, 0); + //添加进map中 + map.put("start", beginDay); + map.put("end", tomorrowDay); + return map; + } + + /** + * 判断传来的时间是否在另外一个时间 + */ + public static WisdomResult isAheadOfTime(DateTime dateTime , DateTime standard){ + WisdomResult wisdomResult = new WisdomResult(1,"true",null); + if (dateTime.isAfter(standard)){ + wisdomResult.setStatus(0); + wisdomResult.setMsg("false"); + } + return wisdomResult; + } + + /** + * 传来一个起始时间，判断结束时间是否在开始时间与开学时间之前 + * @param OpenTime 开学时间 + * @param begin 起始时间 + * @param end 结束时间 + * @return 返回判断结果与消息 + */ + public static WisdomResult isAheadOfSpellTime(DateTime OpenTime , DateTime begin , DateTime end){ + //判断开学时间与起始时间的关系 + WisdomResult wisdomResult1 = isAheadOfTime(begin,OpenTime); + if (wisdomResult1.getStatus() == 0){ + return new WisdomResult(0,"请注意开学时间不可在查询起始时间之后！请修改",null); + } + //判断开学时间与结束时间的关系 + WisdomResult wisdomResult2 = isAheadOfTime(end,OpenTime); + if (wisdomResult2.getStatus() == 0){ + return new WisdomResult(0,"请注意结束时间不可以在开学时间前",null); + } + //判断起始时间与结束时间的关系 + WisdomResult wisdomResult3 = isAheadOfTime(end,begin); + if (wisdomResult3.getStatus() == 0){ + return new WisdomResult(0,"请注意结束时间不可在开始时间之前",null); + } + //编写返回信息 + return new WisdomResult(1,"true",null); + } + + /** + * 将dateTime时间类型转成字符串 + * @param dateTime + * @return + */ + public static String dateTimeToString (DateTime dateTime){ + return dateTime.toString("yyyy-MM-dd HH:mm:ss"); + } + + /** + * 将yyyy-mm-dd 00:00:00专程yyyy-mm-ddT00:00:00 + * @param s 字符串时间 + */ + public static DateTime stringToDatetime(String s){ + int index = s.indexOf(" "); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(s.substring(0,index)); + stringBuilder.append("T"); + stringBuilder.append(s.substring(index+1)); + DateTime dateTime = new DateTime(stringBuilder.toString()); + return dateTime; + } + + /** + * 计算俩个时间中间差多少天 + */ + public static int twoDayGap(DateTime start , DateTime end){ + Period p = new Period(start, end, PeriodType.days()); + return p.getDays(); + } + @Test + public void fun1(){ + int x = 1; + DateTime dateTime = new DateTime(2010,1,1,2,1); + DateTime dateTime1 = new DateTime(2012,1,3,4,5); + final Map map = formatSpellTime(dateTime,dateTime1); + System.out.println(); + } + + + +} diff --git a/wisdom_common/src/main/java/com/smart/utils/JsonUtils.java b/wisdom_common/src/main/java/com/smart/utils/JsonUtils.java new file mode 100644 index 0000000..4f364a6 --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/utils/JsonUtils.java @@ -0,0 +1,72 @@ +package com.smart.utils; + +import java.io.Serializable; +import java.util.List; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; + +/** + * + */ +public class JsonUtils implements Serializable { + + // 定义jackson对象 + private static final ObjectMapper MAPPER = new ObjectMapper(); + + /** + * 将对象转换成json字符串。 + *

Title: pojoToJson

+ *

Description:

+ * @param data + * @return + */ + public static String objectToJson(Object data) { + try { + String string = MAPPER.writeValueAsString(data); + return string; + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return null; + } + + /** + * 将json结果集转化为对象 + * + * @param jsonData json数据 + + * @return + */ + public static T jsonToPojo(String jsonData, Class beanType) { + try { + T t = MAPPER.readValue(jsonData, beanType); + return t; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * 将json数据转换成pojo对象list + *

Title: jsonToList

+ *

Description:

+ * @param jsonData + * @param beanType + * @return + */ + public static List jsonToList(String jsonData, Class beanType) { + JavaType javaType = MAPPER.getTypeFactory().constructParametricType(List.class, beanType); + try { + List list = MAPPER.readValue(jsonData, javaType); + return list; + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + +} diff --git a/wisdom_common/src/main/java/com/smart/utils/StringToJsonSerializer.java b/wisdom_common/src/main/java/com/smart/utils/StringToJsonSerializer.java new file mode 100644 index 0000000..b7a6f7d --- /dev/null +++ b/wisdom_common/src/main/java/com/smart/utils/StringToJsonSerializer.java @@ -0,0 +1,23 @@ +package com.smart.utils; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.JSONSerializer; +import com.alibaba.fastjson.serializer.ObjectSerializer; + +import java.io.IOException; +import java.lang.reflect.Type; + +/** + * 序列化时将string转为json格式,避免出现\转义符号 + * @author lenovo + * + */ +public class StringToJsonSerializer implements ObjectSerializer { + + @Override + public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, + int features) throws IOException { + serializer.write(JSONObject.parseObject(object.toString())); + } + +} \ No newline at end of file diff --git a/wisdom_common/target/classes/com/smart/utils/utils.class b/wisdom_common/target/classes/com/smart/utils/utils.class deleted file mode 100644 index 4be732c..0000000 Binary files a/wisdom_common/target/classes/com/smart/utils/utils.class and /dev/null differ diff --git a/wisdom_common/target/maven-archiver/pom.properties b/wisdom_common/target/maven-archiver/pom.properties deleted file mode 100644 index 9cb1fe8..0000000 --- a/wisdom_common/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 28 15:24:54 CST 2019 -version=1.0-SNAPSHOT -groupId=com.smart -artifactId=wisdom_common diff --git a/wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 91d480c..0000000 --- a/wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -com\smart\utils\utils.class diff --git a/wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 07168ff..0000000 --- a/wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\IDEAworkspace\git_wisdom\wisdom_common\src\main\java\com\smart\utils\utils.java diff --git a/wisdom_common/target/wisdom_common.jar b/wisdom_common/target/wisdom_common.jar deleted file mode 100644 index c969ee6..0000000 Binary files a/wisdom_common/target/wisdom_common.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbAnswerQuestionMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbAnswerQuestionMapper.java new file mode 100644 index 0000000..8fbfcc8 --- /dev/null +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbAnswerQuestionMapper.java @@ -0,0 +1,31 @@ +package com.smart.mapper; + +import com.smart.pojo.TbAnswerQuestion; +import com.smart.pojo.TbAnswerQuestionExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TbAnswerQuestionMapper { + long countByExample(TbAnswerQuestionExample example); + + int deleteByExample(TbAnswerQuestionExample example); + + int deleteByPrimaryKey(String id); + + int insert(TbAnswerQuestion record); + + int insertSelective(TbAnswerQuestion record); + + List selectByExample(TbAnswerQuestionExample example); + + TbAnswerQuestion selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") TbAnswerQuestion record, @Param("example") TbAnswerQuestionExample example); + + int updateByExample(@Param("record") TbAnswerQuestion record, @Param("example") TbAnswerQuestionExample example); + + int updateByPrimaryKeySelective(TbAnswerQuestion record); + + int updateByPrimaryKey(TbAnswerQuestion record); +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassMapper.java index 3284175..841bb23 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbClass; import com.smart.pojo.TbClassExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbClassMapper { long countByExample(TbClassExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassitemMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassitemMapper.java index 55b8bac..385f157 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassitemMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassitemMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbClassitem; import com.smart.pojo.TbClassitemExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbClassitemMapper { long countByExample(TbClassitemExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassroomMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassroomMapper.java index dfb258a..f4ca9ea 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassroomMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbClassroomMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbClassroom; import com.smart.pojo.TbClassroomExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbClassroomMapper { long countByExample(TbClassroomExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeMapper.java index c48c07a..9e822a7 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbCollege; import com.smart.pojo.TbCollegeExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbCollegeMapper { long countByExample(TbCollegeExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeitemMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeitemMapper.java index 984c826..b325d32 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeitemMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCollegeitemMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbCollegeitem; import com.smart.pojo.TbCollegeitemExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbCollegeitemMapper { long countByExample(TbCollegeitemExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseClassMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseClassMapper.java index 4ef4580..a39e750 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseClassMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseClassMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbCourseClass; import com.smart.pojo.TbCourseClassExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbCourseClassMapper { long countByExample(TbCourseClassExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseMapper.java index b7ffb59..4a30181 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbCourse; import com.smart.pojo.TbCourseExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbCourseMapper { long countByExample(TbCourseExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseTeacherMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseTeacherMapper.java index 3f19599..220b913 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseTeacherMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseTeacherMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbCourseTeacher; import com.smart.pojo.TbCourseTeacherExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbCourseTeacherMapper { long countByExample(TbCourseTeacherExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemHomeworkMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemHomeworkMapper.java new file mode 100644 index 0000000..9c18b32 --- /dev/null +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemHomeworkMapper.java @@ -0,0 +1,31 @@ +package com.smart.mapper; + +import com.smart.pojo.TbCourseitemHomework; +import com.smart.pojo.TbCourseitemHomeworkExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TbCourseitemHomeworkMapper { + long countByExample(TbCourseitemHomeworkExample example); + + int deleteByExample(TbCourseitemHomeworkExample example); + + int deleteByPrimaryKey(@Param("courseitemId") String courseitemId, @Param("studentId") String studentId); + + int insert(TbCourseitemHomework record); + + int insertSelective(TbCourseitemHomework record); + + List selectByExample(TbCourseitemHomeworkExample example); + + TbCourseitemHomework selectByPrimaryKey(@Param("courseitemId") String courseitemId, @Param("studentId") String studentId); + + int updateByExampleSelective(@Param("record") TbCourseitemHomework record, @Param("example") TbCourseitemHomeworkExample example); + + int updateByExample(@Param("record") TbCourseitemHomework record, @Param("example") TbCourseitemHomeworkExample example); + + int updateByPrimaryKeySelective(TbCourseitemHomework record); + + int updateByPrimaryKey(TbCourseitemHomework record); +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemMapper.java index 4f05bd6..2b74883 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbCourseitem; import com.smart.pojo.TbCourseitemExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbCourseitemMapper { long countByExample(TbCourseitemExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemPptMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemPptMapper.java new file mode 100644 index 0000000..e9c0b8d --- /dev/null +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbCourseitemPptMapper.java @@ -0,0 +1,31 @@ +package com.smart.mapper; + +import com.smart.pojo.TbCourseitemPpt; +import com.smart.pojo.TbCourseitemPptExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TbCourseitemPptMapper { + long countByExample(TbCourseitemPptExample example); + + int deleteByExample(TbCourseitemPptExample example); + + int deleteByPrimaryKey(String courseitemId); + + int insert(TbCourseitemPpt record); + + int insertSelective(TbCourseitemPpt record); + + List selectByExample(TbCourseitemPptExample example); + + TbCourseitemPpt selectByPrimaryKey(String courseitemId); + + int updateByExampleSelective(@Param("record") TbCourseitemPpt record, @Param("example") TbCourseitemPptExample example); + + int updateByExample(@Param("record") TbCourseitemPpt record, @Param("example") TbCourseitemPptExample example); + + int updateByPrimaryKeySelective(TbCourseitemPpt record); + + int updateByPrimaryKey(TbCourseitemPpt record); +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbOfficerMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbOfficerMapper.java index c85b255..8f8a85f 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbOfficerMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbOfficerMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbOfficer; import com.smart.pojo.TbOfficerExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbOfficerMapper { long countByExample(TbOfficerExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbPositionMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbPositionMapper.java index 0d11d6f..c55b36b 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbPositionMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbPositionMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbPosition; import com.smart.pojo.TbPositionExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbPositionMapper { long countByExample(TbPositionExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionMapper.java index 06afc85..5e259d3 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbProfession; import com.smart.pojo.TbProfessionExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbProfessionMapper { long countByExample(TbProfessionExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionitemMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionitemMapper.java index 596681a..0698d2b 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionitemMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbProfessionitemMapper.java @@ -2,9 +2,8 @@ import com.smart.pojo.TbProfessionitem; import com.smart.pojo.TbProfessionitemExample; -import org.apache.ibatis.annotations.Param; - import java.util.List; +import org.apache.ibatis.annotations.Param; public interface TbProfessionitemMapper { long countByExample(TbProfessionitemExample example); diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbStudentMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbStudentMapper.java index e6a3f5f..096b20f 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbStudentMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbStudentMapper.java @@ -1,11 +1,11 @@ package com.smart.mapper; -import com.smart.pojo.TbStudent; -import com.smart.pojo.TbStudentExample; -import org.apache.ibatis.annotations.Param; +import com.smart.pojo.*; import java.util.List; +import org.apache.ibatis.annotations.Param; + public interface TbStudentMapper { long countByExample(TbStudentExample example); @@ -28,4 +28,122 @@ public interface TbStudentMapper { int updateByPrimaryKeySelective(TbStudent record); int updateByPrimaryKey(TbStudent record); + +// 自己添加的方法 + /** + * 查询特定班级的一段时间内的课程 + * @param classId 查询的班级编号 + * @param start 开始时间 + * @param end 结束时间 + */ + List selectWCourseInfo(@Param("classId")String classId , @Param("start") String start , @Param("end") String end); + + /** + * 使用微信的openid查询学生用户信息 + * @param wexin_id 全网唯一的一个openid + * @return 这个学生的个人信息 + */ + StudentInfo selectStudentInfo(String wexin_id);//用openId查 + + + /** + * 通过账号密码学生账号 + * @param id 账号 + * @param password 密码 + * @return 学生的基本信息 + */ + StudentInfo selectStudentIdAndPassword(@Param("id") String id, @Param("password") String password); + + /** + * 通过学生的id、开始时间，结束时间查询这段时间的考勤情况 + * @param studentId 学生id + * @param start 开始时间 + * @param end 结束时间 + * @return 一个考勤链表 + */ + List selectAttendanceItem(@Param("studentId") String studentId, @Param("start") String start, @Param("end") String end); + + /** + * 通过学号查询信息 + * @param id 学号 + * @return + */ + StudentInfo selectStudentInfoById(String id); + + /** + * 通过学生的id、课程的id、开始时间、结束时间查询这段时间的考勤情况 + * @param studentId 学生id + * @param start 开始时间 + * @param end 结束时间 + * @return 一个考勤链表 + */ + List selectAttendanceItemByStudentCourseStartEnd(@Param("studentId") String studentId,@Param("courseId") String courseId , @Param("start") String start, @Param("end") String end); + + /** + * 通过班级id、课程id、开始时间和结束时间查询 这段时间，这个班的考勤情况 + * @param classId 班级id + * @param courseId 课程id + * @param start 开始 + * @param end 结束 + * @return + */ + List selectAttendanceItemByClassCourseStartEnd(@Param("classId") String classId,@Param("courseId") String courseId , @Param("start") String start, @Param("end") String end); + + /** + * 通过学生id，开始时间，结束时间，查询每天的汇总情况 + * @param id 学生id + * @param start 开始时间 + * @param end 结束时间 + * @return + */ + List selectDaysAttendanceCollectByIDStartEnd(@Param("id")String id,@Param("start")String start,@Param("end")String end); + + /** + * 通过学生id，开始时间，结束时间，查询所有考勤的汇总信息 + * @param id 学生id + * @param start 开始时间 + * @param end 结束时间 + * @return + */ + StageAttendanceCollect queryStageAttendanceCollectByIdStartEnd(@Param("id")String id,@Param("start")String start,@Param("end")String end); + + /** + * 通过课程id，开始时间，结束时间查询本课考勤的汇总信息 + * @param course_id 课程id + * @param start 开始时间 + * @param end 结束时间 + * @return + */ + StageAttendanceCollect queryStageAttendanceCollectByCourseIdStartEnd(@Param("course_id")String course_id,@Param("start")String start,@Param("end")String end); + + /** + * 查看今天有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + * @param start + * @param end + * @return + */ + List queryCheckAttendance(@Param("start")String start, @Param("end")String end, @Param("teacher_id")String teacher_id); + + /** + * 根据这节课的id查询每个人的考勤状况 + * @param courseitem_id 这节课的id + * @return + */ + List queryAttendanceCourseItemByCourseitem_id(String courseitem_id); + + /** + * 根据课程和学生，查询此学生在这门课的平均表现情况 + * @param student_id 学生id + * @param course_id 课程id + * @return + */ + CourseAVGAttendance queryCourseAVGAttendance(@Param("student_id")String student_id, @Param("course_id")String course_id); + + /** + * 根据学生id，课程id查每节课此学生的课堂表现 + * @param student_id 学生id + * @param course_id 课程id + * @return + */ + List queryAttendanceCourseItemByStudentCourse(@Param("student_id")String student_id, @Param("course_id")String course_id); } \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbTeacherMapper.java b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbTeacherMapper.java index a1a1aa9..74ebd5b 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbTeacherMapper.java +++ b/wisdom_manager/wisdom_manager_dao/src/main/java/com/smart/mapper/TbTeacherMapper.java @@ -1,10 +1,14 @@ package com.smart.mapper; +import com.smart.pojo.AttendanceSituation; import com.smart.pojo.TbTeacher; import com.smart.pojo.TbTeacherExample; +import java.util.List; + +import com.smart.pojo.TeacherInfo; import org.apache.ibatis.annotations.Param; -import java.util.List; +import javax.xml.stream.events.EndDocument; public interface TbTeacherMapper { long countByExample(TbTeacherExample example); @@ -28,4 +32,36 @@ public interface TbTeacherMapper { int updateByPrimaryKeySelective(TbTeacher record); int updateByPrimaryKey(TbTeacher record); + + //自己添加的方法 + /** + * 使用微信的openid查询老师用户信息 + * @param wexin_id 全网唯一的一个openid + * @return 这个老师的个人信息 + */ + TeacherInfo selectTeacherInfo(String wexin_id);//用openId查 + + /** + * 通过账号密码老师账号 + * @param id 账号 + * @param password 密码 + * @return 学生的基本信息 + */ + TeacherInfo selectTeacherIdAndPassword(@Param("id") String id, @Param("password") String password); + + /** + * 通过老师查询信息 + * @param id 学号 + * @return + */ + TeacherInfo selectTeacherInfoById(String id); + + /** + * 查询一段时间的缺勤情况 + * @param status 查勤的状态 + * @param start 开始时间(可以和下者同时为null) + * @param end 结束时间(可以和上着同时为null) + * @param courseitem_id 哪节课(可以为null，为null是必须有start和end) + */ + List queryAttendanceSituation(@Param("status")String status, @Param("start")String start, @Param("end")String end, @Param("courseitem_id")String courseitem_id); } \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAnswerQuestionMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAnswerQuestionMapper.xml new file mode 100644 index 0000000..9ccfca2 --- /dev/null +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAnswerQuestionMapper.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, father_id, from_id, from_name, to_id, to_name, time, msg, status + + + + + delete from tb_answer_question + where id = #{id,jdbcType=VARCHAR} + + + delete from tb_answer_question + + + + + + insert into tb_answer_question (id, father_id, from_id, + from_name, to_id, to_name, + time, msg, status) + values (#{id,jdbcType=VARCHAR}, #{fatherId,jdbcType=VARCHAR}, #{fromId,jdbcType=VARCHAR}, + #{fromName,jdbcType=VARCHAR}, #{toId,jdbcType=VARCHAR}, #{toName,jdbcType=VARCHAR}, + #{time,jdbcType=TIMESTAMP}, #{msg,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}) + + + insert into tb_answer_question + + + id, + + + father_id, + + + from_id, + + + from_name, + + + to_id, + + + to_name, + + + time, + + + msg, + + + status, + + + + + #{id,jdbcType=VARCHAR}, + + + #{fatherId,jdbcType=VARCHAR}, + + + #{fromId,jdbcType=VARCHAR}, + + + #{fromName,jdbcType=VARCHAR}, + + + #{toId,jdbcType=VARCHAR}, + + + #{toName,jdbcType=VARCHAR}, + + + #{time,jdbcType=TIMESTAMP}, + + + #{msg,jdbcType=VARCHAR}, + + + #{status,jdbcType=CHAR}, + + + + + + update tb_answer_question + + + id = #{record.id,jdbcType=VARCHAR}, + + + father_id = #{record.fatherId,jdbcType=VARCHAR}, + + + from_id = #{record.fromId,jdbcType=VARCHAR}, + + + from_name = #{record.fromName,jdbcType=VARCHAR}, + + + to_id = #{record.toId,jdbcType=VARCHAR}, + + + to_name = #{record.toName,jdbcType=VARCHAR}, + + + time = #{record.time,jdbcType=TIMESTAMP}, + + + msg = #{record.msg,jdbcType=VARCHAR}, + + + status = #{record.status,jdbcType=CHAR}, + + + + + + + + update tb_answer_question + set id = #{record.id,jdbcType=VARCHAR}, + father_id = #{record.fatherId,jdbcType=VARCHAR}, + from_id = #{record.fromId,jdbcType=VARCHAR}, + from_name = #{record.fromName,jdbcType=VARCHAR}, + to_id = #{record.toId,jdbcType=VARCHAR}, + to_name = #{record.toName,jdbcType=VARCHAR}, + time = #{record.time,jdbcType=TIMESTAMP}, + msg = #{record.msg,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=CHAR} + + + + + + update tb_answer_question + + + father_id = #{fatherId,jdbcType=VARCHAR}, + + + from_id = #{fromId,jdbcType=VARCHAR}, + + + from_name = #{fromName,jdbcType=VARCHAR}, + + + to_id = #{toId,jdbcType=VARCHAR}, + + + to_name = #{toName,jdbcType=VARCHAR}, + + + time = #{time,jdbcType=TIMESTAMP}, + + + msg = #{msg,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=CHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + update tb_answer_question + set father_id = #{fatherId,jdbcType=VARCHAR}, + from_id = #{fromId,jdbcType=VARCHAR}, + from_name = #{fromName,jdbcType=VARCHAR}, + to_id = #{toId,jdbcType=VARCHAR}, + to_name = #{toName,jdbcType=VARCHAR}, + time = #{time,jdbcType=TIMESTAMP}, + msg = #{msg,jdbcType=VARCHAR}, + status = #{status,jdbcType=CHAR} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAttendanceMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAttendanceMapper.xml index 05c1769..18caf24 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAttendanceMapper.xml +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbAttendanceMapper.xml @@ -9,6 +9,8 @@ + + @@ -69,7 +71,8 @@ - attendance_id, courseitem_id, student_id, create_date, status, head_up_rate, goal + attendance_id, courseitem_id, student_id, create_date, status, head_up_rate, goal, + sleep, headup_score @@ -188,6 +205,12 @@ goal = #{record.goal,jdbcType=INTEGER}, + + sleep = #{record.sleep,jdbcType=CHAR}, + + + headup_score = #{record.headupScore,jdbcType=INTEGER}, + @@ -201,7 +224,9 @@ create_date = #{record.createDate,jdbcType=TIMESTAMP}, status = #{record.status,jdbcType=CHAR}, head_up_rate = #{record.headUpRate,jdbcType=DOUBLE}, - goal = #{record.goal,jdbcType=INTEGER} + goal = #{record.goal,jdbcType=INTEGER}, + sleep = #{record.sleep,jdbcType=CHAR}, + headup_score = #{record.headupScore,jdbcType=INTEGER} @@ -227,6 +252,12 @@ goal = #{goal,jdbcType=INTEGER}, + + sleep = #{sleep,jdbcType=CHAR}, + + + headup_score = #{headupScore,jdbcType=INTEGER}, + where attendance_id = #{attendanceId,jdbcType=VARCHAR} @@ -237,7 +268,9 @@ create_date = #{createDate,jdbcType=TIMESTAMP}, status = #{status,jdbcType=CHAR}, head_up_rate = #{headUpRate,jdbcType=DOUBLE}, - goal = #{goal,jdbcType=INTEGER} + goal = #{goal,jdbcType=INTEGER}, + sleep = #{sleep,jdbcType=CHAR}, + headup_score = #{headupScore,jdbcType=INTEGER} where attendance_id = #{attendanceId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseMapper.xml index 680e636..b411c39 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseMapper.xml +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseMapper.xml @@ -4,7 +4,7 @@ - + @@ -110,7 +110,7 @@ semeter, course_note, attendance_total_score, leave_score, attend_score, late_attend_score, head_up_score) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}, + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR}, #{semeter,jdbcType=CHAR}, #{courseNote,jdbcType=VARCHAR}, #{attendanceTotalScore,jdbcType=INTEGER}, #{leaveScore,jdbcType=INTEGER}, #{attendScore,jdbcType=INTEGER}, #{lateAttendScore,jdbcType=INTEGER}, #{headUpScore,jdbcType=INTEGER}) @@ -157,7 +157,7 @@ #{name,jdbcType=VARCHAR}, - #{year,jdbcType=INTEGER}, + #{year,jdbcType=VARCHAR}, #{semeter,jdbcType=CHAR}, @@ -198,7 +198,7 @@ name = #{record.name,jdbcType=VARCHAR}, - year = #{record.year,jdbcType=INTEGER}, + year = #{record.year,jdbcType=VARCHAR}, semeter = #{record.semeter,jdbcType=CHAR}, @@ -230,7 +230,7 @@ update tb_course set id = #{record.id,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR}, - year = #{record.year,jdbcType=INTEGER}, + year = #{record.year,jdbcType=VARCHAR}, semeter = #{record.semeter,jdbcType=CHAR}, course_note = #{record.courseNote,jdbcType=VARCHAR}, attendance_total_score = #{record.attendanceTotalScore,jdbcType=INTEGER}, @@ -249,7 +249,7 @@ name = #{name,jdbcType=VARCHAR}, - year = #{year,jdbcType=INTEGER}, + year = #{year,jdbcType=VARCHAR}, semeter = #{semeter,jdbcType=CHAR}, @@ -278,7 +278,7 @@ update tb_course set name = #{name,jdbcType=VARCHAR}, - year = #{year,jdbcType=INTEGER}, + year = #{year,jdbcType=VARCHAR}, semeter = #{semeter,jdbcType=CHAR}, course_note = #{courseNote,jdbcType=VARCHAR}, attendance_total_score = #{attendanceTotalScore,jdbcType=INTEGER}, diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseitemHomeworkMapper.xml similarity index 50% rename from wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassMapper.xml rename to wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseitemHomeworkMapper.xml index 0e35c44..b5c7ead 100644 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassMapper.xml +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseitemHomeworkMapper.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + @@ -67,15 +67,15 @@ - id, name, grade, profession_id, college_id + courseitem_id, student_id, upload_time, update_time, homework_url - select distinct - from tb_class + from tb_courseitem_homework @@ -83,88 +83,90 @@ order by ${orderByClause} - select - from tb_class - where id = #{id,jdbcType=VARCHAR} + from tb_courseitem_homework + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} + and student_id = #{studentId,jdbcType=VARCHAR} - - delete from tb_class - where id = #{id,jdbcType=VARCHAR} + + delete from tb_courseitem_homework + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} + and student_id = #{studentId,jdbcType=VARCHAR} - - delete from tb_class + + delete from tb_courseitem_homework - - insert into tb_class (id, name, grade, - profession_id, college_id) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{grade,jdbcType=VARCHAR}, - #{professionId,jdbcType=VARCHAR}, #{collegeId,jdbcType=VARCHAR}) + + insert into tb_courseitem_homework (courseitem_id, student_id, upload_time, + update_time, homework_url) + values (#{courseitemId,jdbcType=VARCHAR}, #{studentId,jdbcType=VARCHAR}, #{uploadTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{homeworkUrl,jdbcType=VARCHAR}) - - insert into tb_class + + insert into tb_courseitem_homework - - id, + + courseitem_id, - - name, + + student_id, - - grade, + + upload_time, - - profession_id, + + update_time, - - college_id, + + homework_url, - - #{id,jdbcType=VARCHAR}, + + #{courseitemId,jdbcType=VARCHAR}, - - #{name,jdbcType=VARCHAR}, + + #{studentId,jdbcType=VARCHAR}, - - #{grade,jdbcType=VARCHAR}, + + #{uploadTime,jdbcType=TIMESTAMP}, - - #{professionId,jdbcType=VARCHAR}, + + #{updateTime,jdbcType=TIMESTAMP}, - - #{collegeId,jdbcType=VARCHAR}, + + #{homeworkUrl,jdbcType=VARCHAR}, - + select count(*) from tb_courseitem_homework - update tb_class + update tb_courseitem_homework - - id = #{record.id,jdbcType=VARCHAR}, + + courseitem_id = #{record.courseitemId,jdbcType=VARCHAR}, - - name = #{record.name,jdbcType=VARCHAR}, + + student_id = #{record.studentId,jdbcType=VARCHAR}, - - grade = #{record.grade,jdbcType=VARCHAR}, + + upload_time = #{record.uploadTime,jdbcType=TIMESTAMP}, - - profession_id = #{record.professionId,jdbcType=VARCHAR}, + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - college_id = #{record.collegeId,jdbcType=VARCHAR}, + + homework_url = #{record.homeworkUrl,jdbcType=VARCHAR}, @@ -172,40 +174,38 @@ - update tb_class - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - grade = #{record.grade,jdbcType=VARCHAR}, - profession_id = #{record.professionId,jdbcType=VARCHAR}, - college_id = #{record.collegeId,jdbcType=VARCHAR} + update tb_courseitem_homework + set courseitem_id = #{record.courseitemId,jdbcType=VARCHAR}, + student_id = #{record.studentId,jdbcType=VARCHAR}, + upload_time = #{record.uploadTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + homework_url = #{record.homeworkUrl,jdbcType=VARCHAR} - - update tb_class + + update tb_courseitem_homework - - name = #{name,jdbcType=VARCHAR}, + + upload_time = #{uploadTime,jdbcType=TIMESTAMP}, - - grade = #{grade,jdbcType=VARCHAR}, + + update_time = #{updateTime,jdbcType=TIMESTAMP}, - - profession_id = #{professionId,jdbcType=VARCHAR}, - - - college_id = #{collegeId,jdbcType=VARCHAR}, + + homework_url = #{homeworkUrl,jdbcType=VARCHAR}, - where id = #{id,jdbcType=VARCHAR} + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} + and student_id = #{studentId,jdbcType=VARCHAR} - - update tb_class - set name = #{name,jdbcType=VARCHAR}, - grade = #{grade,jdbcType=VARCHAR}, - profession_id = #{professionId,jdbcType=VARCHAR}, - college_id = #{collegeId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} + + update tb_courseitem_homework + set upload_time = #{uploadTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + homework_url = #{homeworkUrl,jdbcType=VARCHAR} + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} + and student_id = #{studentId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseitemMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseitemPptMapper.xml similarity index 58% rename from wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseitemMapper.xml rename to wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseitemPptMapper.xml index 1834e2f..0609749 100644 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseitemMapper.xml +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbCourseitemPptMapper.xml @@ -1,12 +1,11 @@ - - - - - - - + + + + + + @@ -67,15 +66,15 @@ - id, time, course_id, teacher_id, classroom_id + courseitem_id, upload_time, update_time, file_url - select distinct - from tb_courseitem + from tb_courseitem_PPT @@ -86,85 +85,76 @@ - delete from tb_courseitem - where id = #{id,jdbcType=VARCHAR} + delete from tb_courseitem_PPT + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} - - delete from tb_courseitem + + delete from tb_courseitem_PPT - - insert into tb_courseitem (id, time, course_id, - teacher_id, classroom_id) - values (#{id,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, #{courseId,jdbcType=VARCHAR}, - #{teacherId,jdbcType=VARCHAR}, #{classroomId,jdbcType=VARCHAR}) + + insert into tb_courseitem_PPT (courseitem_id, upload_time, update_time, + file_url) + values (#{courseitemId,jdbcType=VARCHAR}, #{uploadTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{fileUrl,jdbcType=VARCHAR}) - - insert into tb_courseitem + + insert into tb_courseitem_PPT - - id, + + courseitem_id, - - time, + + upload_time, - - course_id, + + update_time, - - teacher_id, - - - classroom_id, + + file_url, - - #{id,jdbcType=VARCHAR}, - - - #{time,jdbcType=TIMESTAMP}, + + #{courseitemId,jdbcType=VARCHAR}, - - #{courseId,jdbcType=VARCHAR}, + + #{uploadTime,jdbcType=TIMESTAMP}, - - #{teacherId,jdbcType=VARCHAR}, + + #{updateTime,jdbcType=TIMESTAMP}, - - #{classroomId,jdbcType=VARCHAR}, + + #{fileUrl,jdbcType=VARCHAR}, - + select count(*) from tb_courseitem_PPT - update tb_courseitem + update tb_courseitem_PPT - - id = #{record.id,jdbcType=VARCHAR}, + + courseitem_id = #{record.courseitemId,jdbcType=VARCHAR}, - - time = #{record.time,jdbcType=TIMESTAMP}, + + upload_time = #{record.uploadTime,jdbcType=TIMESTAMP}, - - course_id = #{record.courseId,jdbcType=VARCHAR}, + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - teacher_id = #{record.teacherId,jdbcType=VARCHAR}, - - - classroom_id = #{record.classroomId,jdbcType=VARCHAR}, + + file_url = #{record.fileUrl,jdbcType=VARCHAR}, @@ -172,40 +162,35 @@ - update tb_courseitem - set id = #{record.id,jdbcType=VARCHAR}, - time = #{record.time,jdbcType=TIMESTAMP}, - course_id = #{record.courseId,jdbcType=VARCHAR}, - teacher_id = #{record.teacherId,jdbcType=VARCHAR}, - classroom_id = #{record.classroomId,jdbcType=VARCHAR} + update tb_courseitem_PPT + set courseitem_id = #{record.courseitemId,jdbcType=VARCHAR}, + upload_time = #{record.uploadTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + file_url = #{record.fileUrl,jdbcType=VARCHAR} - - update tb_courseitem + + update tb_courseitem_PPT - - time = #{time,jdbcType=TIMESTAMP}, - - - course_id = #{courseId,jdbcType=VARCHAR}, + + upload_time = #{uploadTime,jdbcType=TIMESTAMP}, - - teacher_id = #{teacherId,jdbcType=VARCHAR}, + + update_time = #{updateTime,jdbcType=TIMESTAMP}, - - classroom_id = #{classroomId,jdbcType=VARCHAR}, + + file_url = #{fileUrl,jdbcType=VARCHAR}, - where id = #{id,jdbcType=VARCHAR} + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} - - update tb_courseitem - set time = #{time,jdbcType=TIMESTAMP}, - course_id = #{courseId,jdbcType=VARCHAR}, - teacher_id = #{teacherId,jdbcType=VARCHAR}, - classroom_id = #{classroomId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} + + update tb_courseitem_PPT + set upload_time = #{uploadTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + file_url = #{fileUrl,jdbcType=VARCHAR} + where courseitem_id = #{courseitemId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbStudentMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbStudentMapper.xml index f9c49e2..be95759 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbStudentMapper.xml +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbStudentMapper.xml @@ -13,7 +13,23 @@ + + + + + + + + + + + + + + + + @@ -74,7 +90,7 @@ id, name, sex, picture, class_id, profession_id, college_id, password, wexin_id, - phone_code, email + phone_code, email, identity_id @@ -231,6 +253,9 @@ email = #{record.email,jdbcType=VARCHAR}, + + identity_id = #{record.identityId,jdbcType=VARCHAR}, + @@ -248,7 +273,8 @@ password = #{record.password,jdbcType=VARCHAR}, wexin_id = #{record.wexinId,jdbcType=VARCHAR}, phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - email = #{record.email,jdbcType=VARCHAR} + email = #{record.email,jdbcType=VARCHAR}, + identity_id = #{record.identityId,jdbcType=VARCHAR} @@ -286,6 +312,9 @@ email = #{email,jdbcType=VARCHAR}, + + identity_id = #{identityId,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -300,7 +329,134 @@ password = #{password,jdbcType=VARCHAR}, wexin_id = #{wexinId,jdbcType=VARCHAR}, phone_code = #{phoneCode,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR} + email = #{email,jdbcType=VARCHAR}, + identity_id = #{identityId,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbTeacherMapper.xml b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbTeacherMapper.xml index 8b3d92e..87c7142 100644 --- a/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbTeacherMapper.xml +++ b/wisdom_manager/wisdom_manager_dao/src/main/resources/com/smart/mapper/TbTeacherMapper.xml @@ -287,4 +287,42 @@ position_id = #{positionId,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} + + + + + \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/src/main/resources/properties/log4j.properties b/wisdom_manager/wisdom_manager_dao/src/main/resources/log4j.properties similarity index 100% rename from wisdom_manager/wisdom_manager_service/src/main/resources/properties/log4j.properties rename to wisdom_manager/wisdom_manager_dao/src/main/resources/log4j.properties diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbAttendanceMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbAttendanceMapper.class deleted file mode 100644 index cec1ab6..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbAttendanceMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbAttendanceMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbAttendanceMapper.xml deleted file mode 100644 index 05c1769..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbAttendanceMapper.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - attendance_id, courseitem_id, student_id, create_date, status, head_up_rate, goal - - - - - delete from tb_attendance - where attendance_id = #{attendanceId,jdbcType=VARCHAR} - - - delete from tb_attendance - - - - - - insert into tb_attendance (attendance_id, courseitem_id, student_id, - create_date, status, head_up_rate, - goal) - values (#{attendanceId,jdbcType=VARCHAR}, #{courseitemId,jdbcType=VARCHAR}, #{studentId,jdbcType=VARCHAR}, - #{createDate,jdbcType=TIMESTAMP}, #{status,jdbcType=CHAR}, #{headUpRate,jdbcType=DOUBLE}, - #{goal,jdbcType=INTEGER}) - - - insert into tb_attendance - - - attendance_id, - - - courseitem_id, - - - student_id, - - - create_date, - - - status, - - - head_up_rate, - - - goal, - - - - - #{attendanceId,jdbcType=VARCHAR}, - - - #{courseitemId,jdbcType=VARCHAR}, - - - #{studentId,jdbcType=VARCHAR}, - - - #{createDate,jdbcType=TIMESTAMP}, - - - #{status,jdbcType=CHAR}, - - - #{headUpRate,jdbcType=DOUBLE}, - - - #{goal,jdbcType=INTEGER}, - - - - - - update tb_attendance - - - attendance_id = #{record.attendanceId,jdbcType=VARCHAR}, - - - courseitem_id = #{record.courseitemId,jdbcType=VARCHAR}, - - - student_id = #{record.studentId,jdbcType=VARCHAR}, - - - create_date = #{record.createDate,jdbcType=TIMESTAMP}, - - - status = #{record.status,jdbcType=CHAR}, - - - head_up_rate = #{record.headUpRate,jdbcType=DOUBLE}, - - - goal = #{record.goal,jdbcType=INTEGER}, - - - - - - - - update tb_attendance - set attendance_id = #{record.attendanceId,jdbcType=VARCHAR}, - courseitem_id = #{record.courseitemId,jdbcType=VARCHAR}, - student_id = #{record.studentId,jdbcType=VARCHAR}, - create_date = #{record.createDate,jdbcType=TIMESTAMP}, - status = #{record.status,jdbcType=CHAR}, - head_up_rate = #{record.headUpRate,jdbcType=DOUBLE}, - goal = #{record.goal,jdbcType=INTEGER} - - - - - - update tb_attendance - - - courseitem_id = #{courseitemId,jdbcType=VARCHAR}, - - - student_id = #{studentId,jdbcType=VARCHAR}, - - - create_date = #{createDate,jdbcType=TIMESTAMP}, - - - status = #{status,jdbcType=CHAR}, - - - head_up_rate = #{headUpRate,jdbcType=DOUBLE}, - - - goal = #{goal,jdbcType=INTEGER}, - - - where attendance_id = #{attendanceId,jdbcType=VARCHAR} - - - update tb_attendance - set courseitem_id = #{courseitemId,jdbcType=VARCHAR}, - student_id = #{studentId,jdbcType=VARCHAR}, - create_date = #{createDate,jdbcType=TIMESTAMP}, - status = #{status,jdbcType=CHAR}, - head_up_rate = #{headUpRate,jdbcType=DOUBLE}, - goal = #{goal,jdbcType=INTEGER} - where attendance_id = #{attendanceId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassMapper.class deleted file mode 100644 index dfdf6d2..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassitemMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassitemMapper.class deleted file mode 100644 index aaa2a03..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassitemMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassitemMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassitemMapper.xml deleted file mode 100644 index 2bea075..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassitemMapper.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - class_id, master_id, monitor_id, number - - - - - delete from tb_classitem - where class_id = #{classId,jdbcType=VARCHAR} - - - delete from tb_classitem - - - - - - insert into tb_classitem (class_id, master_id, monitor_id, - number) - values (#{classId,jdbcType=VARCHAR}, #{masterId,jdbcType=VARCHAR}, #{monitorId,jdbcType=VARCHAR}, - #{number,jdbcType=INTEGER}) - - - insert into tb_classitem - - - class_id, - - - master_id, - - - monitor_id, - - - number, - - - - - #{classId,jdbcType=VARCHAR}, - - - #{masterId,jdbcType=VARCHAR}, - - - #{monitorId,jdbcType=VARCHAR}, - - - #{number,jdbcType=INTEGER}, - - - - - - update tb_classitem - - - class_id = #{record.classId,jdbcType=VARCHAR}, - - - master_id = #{record.masterId,jdbcType=VARCHAR}, - - - monitor_id = #{record.monitorId,jdbcType=VARCHAR}, - - - number = #{record.number,jdbcType=INTEGER}, - - - - - - - - update tb_classitem - set class_id = #{record.classId,jdbcType=VARCHAR}, - master_id = #{record.masterId,jdbcType=VARCHAR}, - monitor_id = #{record.monitorId,jdbcType=VARCHAR}, - number = #{record.number,jdbcType=INTEGER} - - - - - - update tb_classitem - - - master_id = #{masterId,jdbcType=VARCHAR}, - - - monitor_id = #{monitorId,jdbcType=VARCHAR}, - - - number = #{number,jdbcType=INTEGER}, - - - where class_id = #{classId,jdbcType=VARCHAR} - - - update tb_classitem - set master_id = #{masterId,jdbcType=VARCHAR}, - monitor_id = #{monitorId,jdbcType=VARCHAR}, - number = #{number,jdbcType=INTEGER} - where class_id = #{classId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassroomMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassroomMapper.class deleted file mode 100644 index a36784f..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassroomMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassroomMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassroomMapper.xml deleted file mode 100644 index db6bbf5..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbClassroomMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, segment - - - - - delete from tb_classroom - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_classroom - - - - - - insert into tb_classroom (id, segment) - values (#{id,jdbcType=VARCHAR}, #{segment,jdbcType=VARCHAR}) - - - insert into tb_classroom - - - id, - - - segment, - - - - - #{id,jdbcType=VARCHAR}, - - - #{segment,jdbcType=VARCHAR}, - - - - - - update tb_classroom - - - id = #{record.id,jdbcType=VARCHAR}, - - - segment = #{record.segment,jdbcType=VARCHAR}, - - - - - - - - update tb_classroom - set id = #{record.id,jdbcType=VARCHAR}, - segment = #{record.segment,jdbcType=VARCHAR} - - - - - - update tb_classroom - - - segment = #{segment,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_classroom - set segment = #{segment,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeMapper.class deleted file mode 100644 index 08931fd..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeMapper.xml deleted file mode 100644 index 31f0566..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name - - - - - delete from tb_college - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_college - - - - - - insert into tb_college (id, name) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}) - - - insert into tb_college - - - id, - - - name, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - - - - update tb_college - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - - - - - - update tb_college - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR} - - - - - - update tb_college - - - name = #{name,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_college - set name = #{name,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeitemMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeitemMapper.class deleted file mode 100644 index a835cf3..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeitemMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeitemMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeitemMapper.xml deleted file mode 100644 index 4d0c95b..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCollegeitemMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - college_id, dean_id - - - - - delete from tb_collegeitem - where college_id = #{collegeId,jdbcType=VARCHAR} - - - delete from tb_collegeitem - - - - - - insert into tb_collegeitem (college_id, dean_id) - values (#{collegeId,jdbcType=VARCHAR}, #{deanId,jdbcType=VARCHAR}) - - - insert into tb_collegeitem - - - college_id, - - - dean_id, - - - - - #{collegeId,jdbcType=VARCHAR}, - - - #{deanId,jdbcType=VARCHAR}, - - - - - - update tb_collegeitem - - - college_id = #{record.collegeId,jdbcType=VARCHAR}, - - - dean_id = #{record.deanId,jdbcType=VARCHAR}, - - - - - - - - update tb_collegeitem - set college_id = #{record.collegeId,jdbcType=VARCHAR}, - dean_id = #{record.deanId,jdbcType=VARCHAR} - - - - - - update tb_collegeitem - - - dean_id = #{deanId,jdbcType=VARCHAR}, - - - where college_id = #{collegeId,jdbcType=VARCHAR} - - - update tb_collegeitem - set dean_id = #{deanId,jdbcType=VARCHAR} - where college_id = #{collegeId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseClassMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseClassMapper.class deleted file mode 100644 index 20da414..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseClassMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseClassMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseClassMapper.xml deleted file mode 100644 index fdb69e3..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseClassMapper.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - course_id, class_id - - - - delete from tb_course_class - where course_id = #{courseId,jdbcType=VARCHAR} - and class_id = #{classId,jdbcType=VARCHAR} - - - delete from tb_course_class - - - - - - insert into tb_course_class (course_id, class_id) - values (#{courseId,jdbcType=VARCHAR}, #{classId,jdbcType=VARCHAR}) - - - insert into tb_course_class - - - course_id, - - - class_id, - - - - - #{courseId,jdbcType=VARCHAR}, - - - #{classId,jdbcType=VARCHAR}, - - - - - - update tb_course_class - - - course_id = #{record.courseId,jdbcType=VARCHAR}, - - - class_id = #{record.classId,jdbcType=VARCHAR}, - - - - - - - - update tb_course_class - set course_id = #{record.courseId,jdbcType=VARCHAR}, - class_id = #{record.classId,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseMapper.class deleted file mode 100644 index 30c8863..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseMapper.xml deleted file mode 100644 index 680e636..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseMapper.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, year, semeter, course_note, attendance_total_score, leave_score, attend_score, - late_attend_score, head_up_score - - - - - delete from tb_course - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_course - - - - - - insert into tb_course (id, name, year, - semeter, course_note, attendance_total_score, - leave_score, attend_score, late_attend_score, - head_up_score) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}, - #{semeter,jdbcType=CHAR}, #{courseNote,jdbcType=VARCHAR}, #{attendanceTotalScore,jdbcType=INTEGER}, - #{leaveScore,jdbcType=INTEGER}, #{attendScore,jdbcType=INTEGER}, #{lateAttendScore,jdbcType=INTEGER}, - #{headUpScore,jdbcType=INTEGER}) - - - insert into tb_course - - - id, - - - name, - - - year, - - - semeter, - - - course_note, - - - attendance_total_score, - - - leave_score, - - - attend_score, - - - late_attend_score, - - - head_up_score, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{year,jdbcType=INTEGER}, - - - #{semeter,jdbcType=CHAR}, - - - #{courseNote,jdbcType=VARCHAR}, - - - #{attendanceTotalScore,jdbcType=INTEGER}, - - - #{leaveScore,jdbcType=INTEGER}, - - - #{attendScore,jdbcType=INTEGER}, - - - #{lateAttendScore,jdbcType=INTEGER}, - - - #{headUpScore,jdbcType=INTEGER}, - - - - - - update tb_course - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - year = #{record.year,jdbcType=INTEGER}, - - - semeter = #{record.semeter,jdbcType=CHAR}, - - - course_note = #{record.courseNote,jdbcType=VARCHAR}, - - - attendance_total_score = #{record.attendanceTotalScore,jdbcType=INTEGER}, - - - leave_score = #{record.leaveScore,jdbcType=INTEGER}, - - - attend_score = #{record.attendScore,jdbcType=INTEGER}, - - - late_attend_score = #{record.lateAttendScore,jdbcType=INTEGER}, - - - head_up_score = #{record.headUpScore,jdbcType=INTEGER}, - - - - - - - - update tb_course - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - year = #{record.year,jdbcType=INTEGER}, - semeter = #{record.semeter,jdbcType=CHAR}, - course_note = #{record.courseNote,jdbcType=VARCHAR}, - attendance_total_score = #{record.attendanceTotalScore,jdbcType=INTEGER}, - leave_score = #{record.leaveScore,jdbcType=INTEGER}, - attend_score = #{record.attendScore,jdbcType=INTEGER}, - late_attend_score = #{record.lateAttendScore,jdbcType=INTEGER}, - head_up_score = #{record.headUpScore,jdbcType=INTEGER} - - - - - - update tb_course - - - name = #{name,jdbcType=VARCHAR}, - - - year = #{year,jdbcType=INTEGER}, - - - semeter = #{semeter,jdbcType=CHAR}, - - - course_note = #{courseNote,jdbcType=VARCHAR}, - - - attendance_total_score = #{attendanceTotalScore,jdbcType=INTEGER}, - - - leave_score = #{leaveScore,jdbcType=INTEGER}, - - - attend_score = #{attendScore,jdbcType=INTEGER}, - - - late_attend_score = #{lateAttendScore,jdbcType=INTEGER}, - - - head_up_score = #{headUpScore,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_course - set name = #{name,jdbcType=VARCHAR}, - year = #{year,jdbcType=INTEGER}, - semeter = #{semeter,jdbcType=CHAR}, - course_note = #{courseNote,jdbcType=VARCHAR}, - attendance_total_score = #{attendanceTotalScore,jdbcType=INTEGER}, - leave_score = #{leaveScore,jdbcType=INTEGER}, - attend_score = #{attendScore,jdbcType=INTEGER}, - late_attend_score = #{lateAttendScore,jdbcType=INTEGER}, - head_up_score = #{headUpScore,jdbcType=INTEGER} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseTeacherMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseTeacherMapper.class deleted file mode 100644 index 58d2445..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseTeacherMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseTeacherMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseTeacherMapper.xml deleted file mode 100644 index 30bb7f2..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseTeacherMapper.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - course_id, teacher_id - - - - delete from tb_course_teacher - where course_id = #{courseId,jdbcType=VARCHAR} - and teacher_id = #{teacherId,jdbcType=VARCHAR} - - - delete from tb_course_teacher - - - - - - insert into tb_course_teacher (course_id, teacher_id) - values (#{courseId,jdbcType=VARCHAR}, #{teacherId,jdbcType=VARCHAR}) - - - insert into tb_course_teacher - - - course_id, - - - teacher_id, - - - - - #{courseId,jdbcType=VARCHAR}, - - - #{teacherId,jdbcType=VARCHAR}, - - - - - - update tb_course_teacher - - - course_id = #{record.courseId,jdbcType=VARCHAR}, - - - teacher_id = #{record.teacherId,jdbcType=VARCHAR}, - - - - - - - - update tb_course_teacher - set course_id = #{record.courseId,jdbcType=VARCHAR}, - teacher_id = #{record.teacherId,jdbcType=VARCHAR} - - - - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseitemMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseitemMapper.class deleted file mode 100644 index a23df37..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbCourseitemMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbOfficerMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbOfficerMapper.class deleted file mode 100644 index df0fa2f..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbOfficerMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbOfficerMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbOfficerMapper.xml deleted file mode 100644 index b309fb4..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbOfficerMapper.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, wexin_id, phone_code, email - - - - - delete from tb_officer - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_officer - - - - - - insert into tb_officer (id, name, wexin_id, - phone_code, email) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{wexinId,jdbcType=VARCHAR}, - #{phoneCode,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}) - - - insert into tb_officer - - - id, - - - name, - - - wexin_id, - - - phone_code, - - - email, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{wexinId,jdbcType=VARCHAR}, - - - #{phoneCode,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - - - - update tb_officer - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - wexin_id = #{record.wexinId,jdbcType=VARCHAR}, - - - phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - - - email = #{record.email,jdbcType=VARCHAR}, - - - - - - - - update tb_officer - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - wexin_id = #{record.wexinId,jdbcType=VARCHAR}, - phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - email = #{record.email,jdbcType=VARCHAR} - - - - - - update tb_officer - - - name = #{name,jdbcType=VARCHAR}, - - - wexin_id = #{wexinId,jdbcType=VARCHAR}, - - - phone_code = #{phoneCode,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_officer - set name = #{name,jdbcType=VARCHAR}, - wexin_id = #{wexinId,jdbcType=VARCHAR}, - phone_code = #{phoneCode,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbPositionMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbPositionMapper.class deleted file mode 100644 index 08a25a6..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbPositionMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbPositionMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbPositionMapper.xml deleted file mode 100644 index 4c63445..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbPositionMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name - - - - - delete from tb_position - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_position - - - - - - insert into tb_position (id, name) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}) - - - insert into tb_position - - - id, - - - name, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - - - - update tb_position - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - - - - - - update tb_position - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR} - - - - - - update tb_position - - - name = #{name,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_position - set name = #{name,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionMapper.class deleted file mode 100644 index 4b10ada..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionMapper.xml deleted file mode 100644 index 0f16ccc..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionMapper.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, college_id - - - - - delete from tb_profession - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_profession - - - - - - insert into tb_profession (id, name, college_id - ) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{collegeId,jdbcType=VARCHAR} - ) - - - insert into tb_profession - - - id, - - - name, - - - college_id, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{collegeId,jdbcType=VARCHAR}, - - - - - - update tb_profession - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - college_id = #{record.collegeId,jdbcType=VARCHAR}, - - - - - - - - update tb_profession - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - college_id = #{record.collegeId,jdbcType=VARCHAR} - - - - - - update tb_profession - - - name = #{name,jdbcType=VARCHAR}, - - - college_id = #{collegeId,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_profession - set name = #{name,jdbcType=VARCHAR}, - college_id = #{collegeId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionitemMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionitemMapper.class deleted file mode 100644 index fb11bbf..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionitemMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionitemMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionitemMapper.xml deleted file mode 100644 index dcf7527..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbProfessionitemMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - profession_id, dean_id - - - - - delete from tb_professionitem - where profession_id = #{professionId,jdbcType=VARCHAR} - - - delete from tb_professionitem - - - - - - insert into tb_professionitem (profession_id, dean_id) - values (#{professionId,jdbcType=VARCHAR}, #{deanId,jdbcType=VARCHAR}) - - - insert into tb_professionitem - - - profession_id, - - - dean_id, - - - - - #{professionId,jdbcType=VARCHAR}, - - - #{deanId,jdbcType=VARCHAR}, - - - - - - update tb_professionitem - - - profession_id = #{record.professionId,jdbcType=VARCHAR}, - - - dean_id = #{record.deanId,jdbcType=VARCHAR}, - - - - - - - - update tb_professionitem - set profession_id = #{record.professionId,jdbcType=VARCHAR}, - dean_id = #{record.deanId,jdbcType=VARCHAR} - - - - - - update tb_professionitem - - - dean_id = #{deanId,jdbcType=VARCHAR}, - - - where profession_id = #{professionId,jdbcType=VARCHAR} - - - update tb_professionitem - set dean_id = #{deanId,jdbcType=VARCHAR} - where profession_id = #{professionId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbStudentMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbStudentMapper.class deleted file mode 100644 index 9f201bd..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbStudentMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbStudentMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbStudentMapper.xml deleted file mode 100644 index f9c49e2..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbStudentMapper.xml +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, sex, picture, class_id, profession_id, college_id, password, wexin_id, - phone_code, email - - - - - delete from tb_student - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_student - - - - - - insert into tb_student (id, name, sex, picture, - class_id, profession_id, college_id, - password, wexin_id, phone_code, - email) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, #{picture,jdbcType=VARCHAR}, - #{classId,jdbcType=VARCHAR}, #{professionId,jdbcType=VARCHAR}, #{collegeId,jdbcType=VARCHAR}, - #{password,jdbcType=VARCHAR}, #{wexinId,jdbcType=VARCHAR}, #{phoneCode,jdbcType=VARCHAR}, - #{email,jdbcType=VARCHAR}) - - - insert into tb_student - - - id, - - - name, - - - sex, - - - picture, - - - class_id, - - - profession_id, - - - college_id, - - - password, - - - wexin_id, - - - phone_code, - - - email, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{sex,jdbcType=CHAR}, - - - #{picture,jdbcType=VARCHAR}, - - - #{classId,jdbcType=VARCHAR}, - - - #{professionId,jdbcType=VARCHAR}, - - - #{collegeId,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{wexinId,jdbcType=VARCHAR}, - - - #{phoneCode,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - - - - update tb_student - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - sex = #{record.sex,jdbcType=CHAR}, - - - picture = #{record.picture,jdbcType=VARCHAR}, - - - class_id = #{record.classId,jdbcType=VARCHAR}, - - - profession_id = #{record.professionId,jdbcType=VARCHAR}, - - - college_id = #{record.collegeId,jdbcType=VARCHAR}, - - - password = #{record.password,jdbcType=VARCHAR}, - - - wexin_id = #{record.wexinId,jdbcType=VARCHAR}, - - - phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - - - email = #{record.email,jdbcType=VARCHAR}, - - - - - - - - update tb_student - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - sex = #{record.sex,jdbcType=CHAR}, - picture = #{record.picture,jdbcType=VARCHAR}, - class_id = #{record.classId,jdbcType=VARCHAR}, - profession_id = #{record.professionId,jdbcType=VARCHAR}, - college_id = #{record.collegeId,jdbcType=VARCHAR}, - password = #{record.password,jdbcType=VARCHAR}, - wexin_id = #{record.wexinId,jdbcType=VARCHAR}, - phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - email = #{record.email,jdbcType=VARCHAR} - - - - - - update tb_student - - - name = #{name,jdbcType=VARCHAR}, - - - sex = #{sex,jdbcType=CHAR}, - - - picture = #{picture,jdbcType=VARCHAR}, - - - class_id = #{classId,jdbcType=VARCHAR}, - - - profession_id = #{professionId,jdbcType=VARCHAR}, - - - college_id = #{collegeId,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - wexin_id = #{wexinId,jdbcType=VARCHAR}, - - - phone_code = #{phoneCode,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_student - set name = #{name,jdbcType=VARCHAR}, - sex = #{sex,jdbcType=CHAR}, - picture = #{picture,jdbcType=VARCHAR}, - class_id = #{classId,jdbcType=VARCHAR}, - profession_id = #{professionId,jdbcType=VARCHAR}, - college_id = #{collegeId,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - wexin_id = #{wexinId,jdbcType=VARCHAR}, - phone_code = #{phoneCode,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbTeacherMapper.class b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbTeacherMapper.class deleted file mode 100644 index 0cb7f7f..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbTeacherMapper.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbTeacherMapper.xml b/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbTeacherMapper.xml deleted file mode 100644 index 8b3d92e..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/classes/com/smart/mapper/TbTeacherMapper.xml +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, sex, picture, college_id, password, wexin_id, phone_code, email, position_id - - - - - delete from tb_teacher - where id = #{id,jdbcType=VARCHAR} - - - delete from tb_teacher - - - - - - insert into tb_teacher (id, name, sex, picture, - college_id, password, wexin_id, - phone_code, email, position_id - ) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, #{picture,jdbcType=VARCHAR}, - #{collegeId,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{wexinId,jdbcType=VARCHAR}, - #{phoneCode,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{positionId,jdbcType=VARCHAR} - ) - - - insert into tb_teacher - - - id, - - - name, - - - sex, - - - picture, - - - college_id, - - - password, - - - wexin_id, - - - phone_code, - - - email, - - - position_id, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{sex,jdbcType=CHAR}, - - - #{picture,jdbcType=VARCHAR}, - - - #{collegeId,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{wexinId,jdbcType=VARCHAR}, - - - #{phoneCode,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - #{positionId,jdbcType=VARCHAR}, - - - - - - update tb_teacher - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - sex = #{record.sex,jdbcType=CHAR}, - - - picture = #{record.picture,jdbcType=VARCHAR}, - - - college_id = #{record.collegeId,jdbcType=VARCHAR}, - - - password = #{record.password,jdbcType=VARCHAR}, - - - wexin_id = #{record.wexinId,jdbcType=VARCHAR}, - - - phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - - - email = #{record.email,jdbcType=VARCHAR}, - - - position_id = #{record.positionId,jdbcType=VARCHAR}, - - - - - - - - update tb_teacher - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - sex = #{record.sex,jdbcType=CHAR}, - picture = #{record.picture,jdbcType=VARCHAR}, - college_id = #{record.collegeId,jdbcType=VARCHAR}, - password = #{record.password,jdbcType=VARCHAR}, - wexin_id = #{record.wexinId,jdbcType=VARCHAR}, - phone_code = #{record.phoneCode,jdbcType=VARCHAR}, - email = #{record.email,jdbcType=VARCHAR}, - position_id = #{record.positionId,jdbcType=VARCHAR} - - - - - - update tb_teacher - - - name = #{name,jdbcType=VARCHAR}, - - - sex = #{sex,jdbcType=CHAR}, - - - picture = #{picture,jdbcType=VARCHAR}, - - - college_id = #{collegeId,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - wexin_id = #{wexinId,jdbcType=VARCHAR}, - - - phone_code = #{phoneCode,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - position_id = #{positionId,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update tb_teacher - set name = #{name,jdbcType=VARCHAR}, - sex = #{sex,jdbcType=CHAR}, - picture = #{picture,jdbcType=VARCHAR}, - college_id = #{collegeId,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - wexin_id = #{wexinId,jdbcType=VARCHAR}, - phone_code = #{phoneCode,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR}, - position_id = #{positionId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_dao/target/maven-archiver/pom.properties b/wisdom_manager/wisdom_manager_dao/target/maven-archiver/pom.properties deleted file mode 100644 index 841193a..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 28 15:24:56 CST 2019 -version=1.0-SNAPSHOT -groupId=com.smart -artifactId=wisdom_manager_dao diff --git a/wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 02ce206..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,16 +0,0 @@ -com\smart\mapper\TbAttendanceMapper.class -com\smart\mapper\TbClassroomMapper.class -com\smart\mapper\TbCollegeitemMapper.class -com\smart\mapper\TbProfessionMapper.class -com\smart\mapper\TbClassMapper.class -com\smart\mapper\TbCourseTeacherMapper.class -com\smart\mapper\TbPositionMapper.class -com\smart\mapper\TbClassitemMapper.class -com\smart\mapper\TbCourseMapper.class -com\smart\mapper\TbProfessionitemMapper.class -com\smart\mapper\TbCollegeMapper.class -com\smart\mapper\TbOfficerMapper.class -com\smart\mapper\TbStudentMapper.class -com\smart\mapper\TbTeacherMapper.class -com\smart\mapper\TbCourseitemMapper.class -com\smart\mapper\TbCourseClassMapper.class diff --git a/wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index f440fe3..0000000 --- a/wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,16 +0,0 @@ -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbAttendanceMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbCollegeitemMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbClassroomMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbPositionMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbProfessionMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbStudentMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbClassMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbClassitemMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbCourseMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbCourseTeacherMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbCourseClassMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbProfessionitemMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbOfficerMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbCollegeMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbCourseitemMapper.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_dao\src\main\java\com\smart\mapper\TbTeacherMapper.java diff --git a/wisdom_manager/wisdom_manager_dao/target/wisdom_manager_dao.jar b/wisdom_manager/wisdom_manager_dao/target/wisdom_manager_dao.jar deleted file mode 100644 index 3c7d472..0000000 Binary files a/wisdom_manager/wisdom_manager_dao/target/wisdom_manager_dao.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com.smart.service.impl/test.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com.smart.service.impl/test.java deleted file mode 100644 index f9f05f3..0000000 --- a/wisdom_manager/wisdom_manager_interface/src/main/java/com.smart.service.impl/test.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.smart.service.impl; - -public class test { -} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/CourseCriticismService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/CourseCriticismService.java new file mode 100644 index 0000000..a6c424c --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/CourseCriticismService.java @@ -0,0 +1,19 @@ +package com.smart.service; + +import com.smart.pojo.TbAnswerQuestion; +import com.smart.pojo.WisdomResult; + +import java.util.UUID; + +public interface CourseCriticismService { + + /** + * 给课程留言，父节点 + * param tbAnswerQuestion 课程的具体内容 + * @return + */ + public WisdomResult addCriticism(TbAnswerQuestion tbAnswerQuestion); + + + public WisdomResult getCriticismListForOneCourse(String courseId); +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/CourseService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/CourseService.java new file mode 100644 index 0000000..cc66366 --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/CourseService.java @@ -0,0 +1,45 @@ +package com.smart.service; + +import org.joda.time.DateTime; + +import java.util.Map; + + +public interface CourseService { + + /** + * 开学时间 + * @return 返回开学日期 + */ + public DateTime getOpentime(); + + /** + * 放假时间 + */ + public DateTime getRecessTime(); + + /** + * 某一天是在该学其中的第几周 + */ + public Integer dayOfWeekInThisSemester(DateTime dateTime); + + /** + * 获取该学期的第n周 + */ + public Map getNWeekInThisSemester(int n); + + /** + * 获取某一天是这个学期第几个月 + */ + public Integer dayOfMonthInThisSemester(DateTime dateTime); + + /** + * 获取第n个月的区间 + */ + public Map getNMonthInThisSemester(int n); + + /** + * 计算该学期有几个月 + */ + public Integer monthInThisSemester(); +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/OfficeLoginService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/OfficeLoginService.java new file mode 100644 index 0000000..176abc8 --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/OfficeLoginService.java @@ -0,0 +1,4 @@ +package com.smart.service; + +public interface OfficeLoginService { +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentAttendanceService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentAttendanceService.java new file mode 100644 index 0000000..2acc6f0 --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentAttendanceService.java @@ -0,0 +1,205 @@ +package com.smart.service; + +import com.smart.pojo.DaysAttendanceCollect; +import com.smart.pojo.StudentInfo; +import com.smart.pojo.WisdomResult; +import org.joda.time.DateTime; + +import java.util.List; + +/** + * 学生考勤接口 + */ +public interface StudentAttendanceService { + /** + * 通过起始时间获取某一位学生的某一节课具体一段时间的考勤信息 + * @param start 开始时间 + * @param end 结束时间 + * @param classId 查询的学生信息 + * @param courseId 某一节课的id + * @return 结果集 + */ + public WisdomResult getSpellTimeAttendance(String start , String end , String classId , String courseId); + + /** + * 通过起始时间与课程id查询这段时间中某位学生的每一节课的考勤情况 + * @param start 开始时间 + * @param end 结束时间 + * @param studentInfo 学生信息 + * @param courseId 课程id + */ + public WisdomResult getSpellTimeAttendanceOfOneCourse(String start , String end , StudentInfo studentInfo, String courseId); + + /** + * 上一个方法的重载 + */ + public WisdomResult getSpellTimeAttendanceOfOneCourse(DateTime start , DateTime end , StudentInfo studentInfo, String courseId); + /** + * 查出本周的某一节课课程考勤信息 + * @param studentInfo 学生信息 + * @param courseId 某一节课程的id + */ + public WisdomResult getThisWeekAttendanceOfOneCourse(StudentInfo studentInfo, String courseId); + + /** + * 查出上一周的某一节课考勤信息 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + public WisdomResult getLastWeekAttendanceOfOneCourse(StudentInfo studentInfo, String courseId); + + /** + * 查询本月的某一节课的考勤信息 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + public WisdomResult getThisMonthAttendanceOfOneCourse(StudentInfo studentInfo, String courseId); + + /** + * 查出上一个月的某一节课的考勤信息 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + public WisdomResult getLastMonthAttendanceOfOneCourse(StudentInfo studentInfo, String courseId); + + /** + * 查询这学期某一节课的考勤信息 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + public WisdomResult getThisSemesterAttendanceOfOneCourse(StudentInfo studentInfo, String courseId); + + /** + * 查询该学生一段时间内所有课程的考勤信息 + * @param start 开始时间 + * @param end 结束时间 + * @param studentInfo 学生信息 + */ + public WisdomResult getASpellTimeAttendanceOfAllCoourse(String start,String end , StudentInfo studentInfo); + + /** + * 重载上面的方法 + */ + public WisdomResult getASpellTimeAttendanceOfAllCoourse(DateTime start,DateTime end , StudentInfo studentInfo); + + /** + * 查询这个学生该星期所有课程的考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getThisWeekAttendanceOfAllCoourse(StudentInfo studentInfo); + + /** + * 查询这个学生上个星期所有的课程的考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getLastWeekAttendanceOfAllCoourse(StudentInfo studentInfo); + + /** + * 查询这个学生本月的所有课程的考勤情况 + * @param studentInfo 学生信息 + */ + public WisdomResult getThisMonthAttendanceOfAllCoourse(StudentInfo studentInfo); + + /** + * 查询这个学生生上个月的所有课程的考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getLastMonthAttendanceOfAllCoourse( StudentInfo studentInfo); + + /** + * 查询这个学生这个学期的所有课程的考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getThisSemesterAttendanceOfAllCoourse(StudentInfo studentInfo); + + /** + * ***************************************************************** + * 查询每天的考勤统计 + * 平均得分 几节课 哪一天 平均抬头率 + */ + + /** + * 二次计算一段时间的大概考勤 + */ + public WisdomResult calculateDaysAttendanceCollectList(DateTime startTime, DateTime endTime, List list); + + /** + * 通过学生id，查出一段时间内每一天的总体信息 + * @param studentInfo 学生信息 + * @param start 开始时间 + * @param end 结束时时间 + */ + public WisdomResult getASpellTimeProbableAttOfEveryday(StudentInfo studentInfo,String start,String end); + + /** + * 上面的方法重载 + */ + public WisdomResult getASpellTimeProbableAttOfEveryday(StudentInfo studentInfo,DateTime start,DateTime end); + + /** + * 查询出本周的每一天的大致考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getThisWeekProbableAttOfEveryday(StudentInfo studentInfo); + + /** + * 查询出上一周的每一天的大致考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getLastWeekProbableAttOfEveryday(StudentInfo studentInfo); + + /** + * 查询出这个月每一天的大致的考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getThisMonthProbableAttOfEveryday(StudentInfo studentInfo); + + /** + * 查询出这个月每一天的大致考勤信息 + * @param studentInfo 学生信息 + * @return + */ + public WisdomResult getLastMonthProbableAttOfEveryday(StudentInfo studentInfo); + + /** + * 查询出某一天的大致考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getOneDayProbableAttOfEveryday(StudentInfo studentInfo,String oneday); + + /** + * 查询出某一天的大致考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult getOneDayProbableAttOfEveryday(StudentInfo studentInfo,DateTime oneday); + + /** + * 查询出今天的大致考勤信息 + * @param studentInfo 学生信息 + */ + public WisdomResult gettodayProbableAttOfEveryday(StudentInfo studentInfo); + + /** + * 查询出这个学期每一天的考勤信息 + * @param page + * @param size + * @param studentInfo 学生信息 + */ + public WisdomResult getThisSemesterProbableAttOfEveryday(Integer page, Integer size, StudentInfo studentInfo); + + /** + * 计算昨天与今天的考勤抬头率和总分的差值 + */ + public WisdomResult getYesterdayWithTodayAttDiff(StudentInfo studentInfo); + + /** + * 计算上月和这个月额抬头率以及总分的差值 + */ + public WisdomResult getLastMonthWithThisMonthAttDiff(StudentInfo studentInfo); + + /** + * 计算出上周与这个周以及总份的差值 + * @return + */ + public WisdomResult getLastWeekWithThisWeekAttDiff(StudentInfo studentInfo); +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentCourseService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentCourseService.java new file mode 100644 index 0000000..2eba7da --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentCourseService.java @@ -0,0 +1,95 @@ +package com.smart.service; + +import com.smart.pojo.StudentInfo; + +import com.smart.pojo.WisdomResult; +import org.joda.time.DateTime; + +import java.util.Map; + +/** + * 用于查询课程信息的service + */ +public interface StudentCourseService { + + /** + * 获取一位同学某段时间内有哪一些课程 + * @param studentInfo 要查询的学生 + * @param begin 开始时间 + * @param end 结束时间 + * @return 返回查询结果R + */ + public WisdomResult getCourseOfSpellTime(StudentInfo studentInfo , DateTime begin , DateTime end); + + /** + * 因为joda-time不能进行序列化，所以只能进行字符串型的时间传输 + * @param begin 开始时间的字符串 + * @param end 结束时间的字符串 + */ + public WisdomResult getCourseOfSpellTime(StudentInfo studentInfo , String begin , String end); + + /** + * 获取一位同学某段时间内有哪一些课程 + * @param studentInfo 要查询的学生 + * @return 返回查询结果 + */ + public WisdomResult getCourseOfSpellTime(StudentInfo studentInfo , Map map); + + /** + * 获取某一天有哪些课程 + * @param studentInfo 需要查询的学生 + * @param day 某一天的时间 + * @return 查询结果 + */ + public WisdomResult getCourseOfDay(StudentInfo studentInfo , DateTime day); + + /** + * 因为joda-time不支持序列化，所以时间参数不可以之间传递，要到这边了以后才能传递 + * @param day 字符串形式的时间 + */ + public WisdomResult getCourseOfDay(StudentInfo studentInfo , String day); + + /** + * 获取今天有哪些课程 + */ + public WisdomResult getCourseOfToday(StudentInfo studentInfo); + + /** + * 获取这个学期的课程，从开学到学期末 + */ + public WisdomResult getCourseOfThisSemester(StudentInfo studentInfo); + + /** + * 获取第n周的课程,从开学第一个星期算起 + */ + public WisdomResult getCourseInXWeek(StudentInfo studentInfo , Integer n); + + /** + * 获取本周有哪些课程 + */ + public WisdomResult getCourseThisWeek(StudentInfo studentInfo); + + /** + * 获得该学的课程 + */ + public WisdomResult getCourseThisMonth(StudentInfo studentInfo); + + /** + * 获取该学期第x个月的课程 + */ + public WisdomResult getCourseInXMonth(StudentInfo studentInfo , Integer n); + + /** + * 获取该学生前n个星期的课程信息 + */ + public WisdomResult getCourseFrontOfXMonth(StudentInfo studentInfo , Integer n); + + /** + * 获取该学生前n个月的课程信息 + * @param studentInfo + * @param n + * @return + */ + public WisdomResult getCourseFrontOfXWeek(StudentInfo studentInfo , Integer n); + +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentLoginService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentLoginService.java new file mode 100644 index 0000000..e15ec2d --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/StudentLoginService.java @@ -0,0 +1,20 @@ +package com.smart.service; + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.TbStudent; +import com.smart.pojo.WisdomResult; + +/** + * 学生登陆service + */ +public interface StudentLoginService { + /** + * 通过web端登陆学生端 + */ + WisdomResult studentLoginOfWeb(TbStudent tbStudent); + + /** + * 通过小程序端登陆学生端 + */ + WisdomResult studentLoginOfWX(StudentInfo studentInfo); +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherAttendanceService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherAttendanceService.java new file mode 100644 index 0000000..84a60fb --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherAttendanceService.java @@ -0,0 +1,124 @@ +package com.smart.service; + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.TeacherInfo; +import com.smart.pojo.WisdomResult; +import org.joda.time.DateTime; + +public interface TeacherAttendanceService { + /** + * 查询一段时间内缺勤的人 + */ + + /** + * 查询本节课多少个人缺勤 + */ + + /** + * 查询一段时间内每节课的缺勤情况 + */ + + /** + * 查询本节课有多少人睡觉 + */ + + /** + * 查询一段时间内有有多少人睡觉 + */ + + /** + * 查询一段时间内每一节课多少人睡觉 + */ + + + /** + * 查询整个学期该学生在具体某节课上的表现情况 + */ + public WisdomResult getStudentAttOfThisSemester(String courseItemId,String studentId); + /** + * 查看某一个学生的具体某一节课的信息 + */ + public WisdomResult getStudentAbsentOfOneCourse(String start , String end, String courseId,String studentId); + + /** + * 查看某一个学生在这个学期中某一段时间的具体考勤 + */ + + /** + * 老师修改这节课如何考勤 + */ + + /** + * 查看今天上课的班级的考勤情况 + */ + public WisdomResult getCourseAttOfClassToday(String classId,String courseId); + + /** + * *********************************************************************************** + * 有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + + /** + * 查看今天有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + public WisdomResult getAttASpellTime(String start, String end, TeacherInfo teacherInfo); + + /** + * 查看今天有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + public WisdomResult getAttASpellTime(DateTime start, DateTime end, TeacherInfo teacherInfo); + + /** + * 获得今天的考勤信息 + * 查看今天有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + public WisdomResult getAttToday(TeacherInfo teacherInfo); + + /** + * 获得这周的考勤信息 + * 查看这周有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + public WisdomResult getAttThisWeek(TeacherInfo teacherInfo); + + /** + * 获得这月的考勤信息 + * 查看这月有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + public WisdomResult getAttThisMont(TeacherInfo teacherInfo); + + /** + * 获得这学期的考勤信息 + * 查看这学期有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数 + */ + public WisdomResult getAttThisSemester(TeacherInfo teacherInfo); + + /** + * *********************************************************************************** + */ + + /** + * 查询某一天的课程列表，有每一节课的时间等上述考勤信息 + */ + public WisdomResult getAttOfOneDay(String day ,TeacherInfo teacherInfo); + + /** + * 查询某一节课所有学生的考勤信息,带排序 + */ + public WisdomResult getAttOfClass(String crouseItemId); + + /** + * *********************************************************************************** + */ + + /** + * 查看一个学生，在一门课里面这学期的考勤状态 + */ + public WisdomResult getStudentAttOfCourse(String studentId,String courseId); + + /** + * 查看一个学生，在一门课里面这学期的每一课考勤状态 + */ + public WisdomResult getStudentAttInEveryCourse(String studentId,String courseId); + + +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherCourseService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherCourseService.java new file mode 100644 index 0000000..2de9cd3 --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherCourseService.java @@ -0,0 +1,16 @@ +package com.smart.service; + +import com.smart.pojo.TeacherInfo; +import com.smart.pojo.WisdomResult; + +public interface TeacherCourseService { + /** + * 获取该老师有哪些课程 + */ + public WisdomResult getCourseNumOfTeacher(TeacherInfo teacherInfo); + + /** + * 查询学生的个人信息 + */ + public WisdomResult getStudentInfo(String studentId); +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherLoginService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherLoginService.java new file mode 100644 index 0000000..697b689 --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/TeacherLoginService.java @@ -0,0 +1,20 @@ +package com.smart.service; + +import com.smart.pojo.TbTeacher; +import com.smart.pojo.WisdomResult; + +/** + * teacher登陆所对应的service + */ +public interface TeacherLoginService { + /** + * 老师账号密码登陆 + */ + public WisdomResult teacherLoginOfWeb(TbTeacher tbTeacher); + + /** + * 老师通过openid登陆 + */ + public WisdomResult teacherLoginOfWX(TbTeacher tbTeacher); + +} diff --git a/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/WXLoginService.java b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/WXLoginService.java new file mode 100644 index 0000000..f1b8ebe --- /dev/null +++ b/wisdom_manager/wisdom_manager_interface/src/main/java/com/smart/service/WXLoginService.java @@ -0,0 +1,19 @@ +package com.smart.service; + +import com.smart.pojo.WisdomResult; + +import java.io.IOException; + +public interface WXLoginService { + /** + * 去腾讯获取openid，然后进行登陆操作 + */ + public WisdomResult login(String appid , String secret , String js_code , String grant_type) throws IOException, Exception; + + /** + * 第一次登陆，绑定openid与account + */ + public WisdomResult bindOpenidWithAccount(String openid , String account , String password ,int status); + + public String test(); +} diff --git a/wisdom_manager/wisdom_manager_interface/target/classes/com/smart/service/impl/test.class b/wisdom_manager/wisdom_manager_interface/target/classes/com/smart/service/impl/test.class deleted file mode 100644 index 7969582..0000000 Binary files a/wisdom_manager/wisdom_manager_interface/target/classes/com/smart/service/impl/test.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_interface/target/maven-archiver/pom.properties b/wisdom_manager/wisdom_manager_interface/target/maven-archiver/pom.properties deleted file mode 100644 index 83537da..0000000 --- a/wisdom_manager/wisdom_manager_interface/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 28 15:24:55 CST 2019 -version=1.0-SNAPSHOT -groupId=com.smart -artifactId=wisdom_manager_interface diff --git a/wisdom_manager/wisdom_manager_interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/wisdom_manager/wisdom_manager_interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index db220fe..0000000 --- a/wisdom_manager/wisdom_manager_interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -com\smart\service\impl\test.class diff --git a/wisdom_manager/wisdom_manager_interface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/wisdom_manager/wisdom_manager_interface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index f9b45b3..0000000 --- a/wisdom_manager/wisdom_manager_interface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_interface\src\main\java\com.smart.service.impl\test.java diff --git a/wisdom_manager/wisdom_manager_interface/target/wisdom_manager_interface.jar b/wisdom_manager/wisdom_manager_interface/target/wisdom_manager_interface.jar deleted file mode 100644 index e864c41..0000000 Binary files a/wisdom_manager/wisdom_manager_interface/target/wisdom_manager_interface.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAnswerQuestion.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAnswerQuestion.java new file mode 100644 index 0000000..daa1231 --- /dev/null +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAnswerQuestion.java @@ -0,0 +1,98 @@ +package com.smart.pojo; + +import java.io.Serializable; +import java.util.Date; + +public class TbAnswerQuestion implements Serializable { + private String id; + + private String fatherId; + + private String fromId; + + private String fromName; + + private String toId; + + private String toName; + + private Date time; + + private String msg; + + private String status; + + private static final long serialVersionUID = 1L; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id == null ? null : id.trim(); + } + + public String getFatherId() { + return fatherId; + } + + public void setFatherId(String fatherId) { + this.fatherId = fatherId == null ? null : fatherId.trim(); + } + + public String getFromId() { + return fromId; + } + + public void setFromId(String fromId) { + this.fromId = fromId == null ? null : fromId.trim(); + } + + public String getFromName() { + return fromName; + } + + public void setFromName(String fromName) { + this.fromName = fromName == null ? null : fromName.trim(); + } + + public String getToId() { + return toId; + } + + public void setToId(String toId) { + this.toId = toId == null ? null : toId.trim(); + } + + public String getToName() { + return toName; + } + + public void setToName(String toName) { + this.toName = toName == null ? null : toName.trim(); + } + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg == null ? null : msg.trim(); + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status == null ? null : status.trim(); + } +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAnswerQuestionExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAnswerQuestionExample.java new file mode 100644 index 0000000..5d27828 --- /dev/null +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAnswerQuestionExample.java @@ -0,0 +1,821 @@ +package com.smart.pojo; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbAnswerQuestionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbAnswerQuestionExample() { + oredCriteria = new ArrayList(); + } + + 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 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; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andFatherIdIsNull() { + addCriterion("father_id is null"); + return (Criteria) this; + } + + public Criteria andFatherIdIsNotNull() { + addCriterion("father_id is not null"); + return (Criteria) this; + } + + public Criteria andFatherIdEqualTo(String value) { + addCriterion("father_id =", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdNotEqualTo(String value) { + addCriterion("father_id <>", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdGreaterThan(String value) { + addCriterion("father_id >", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdGreaterThanOrEqualTo(String value) { + addCriterion("father_id >=", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdLessThan(String value) { + addCriterion("father_id <", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdLessThanOrEqualTo(String value) { + addCriterion("father_id <=", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdLike(String value) { + addCriterion("father_id like", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdNotLike(String value) { + addCriterion("father_id not like", value, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdIn(List values) { + addCriterion("father_id in", values, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdNotIn(List values) { + addCriterion("father_id not in", values, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdBetween(String value1, String value2) { + addCriterion("father_id between", value1, value2, "fatherId"); + return (Criteria) this; + } + + public Criteria andFatherIdNotBetween(String value1, String value2) { + addCriterion("father_id not between", value1, value2, "fatherId"); + return (Criteria) this; + } + + public Criteria andFromIdIsNull() { + addCriterion("from_id is null"); + return (Criteria) this; + } + + public Criteria andFromIdIsNotNull() { + addCriterion("from_id is not null"); + return (Criteria) this; + } + + public Criteria andFromIdEqualTo(String value) { + addCriterion("from_id =", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdNotEqualTo(String value) { + addCriterion("from_id <>", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdGreaterThan(String value) { + addCriterion("from_id >", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdGreaterThanOrEqualTo(String value) { + addCriterion("from_id >=", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdLessThan(String value) { + addCriterion("from_id <", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdLessThanOrEqualTo(String value) { + addCriterion("from_id <=", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdLike(String value) { + addCriterion("from_id like", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdNotLike(String value) { + addCriterion("from_id not like", value, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdIn(List values) { + addCriterion("from_id in", values, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdNotIn(List values) { + addCriterion("from_id not in", values, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdBetween(String value1, String value2) { + addCriterion("from_id between", value1, value2, "fromId"); + return (Criteria) this; + } + + public Criteria andFromIdNotBetween(String value1, String value2) { + addCriterion("from_id not between", value1, value2, "fromId"); + return (Criteria) this; + } + + public Criteria andFromNameIsNull() { + addCriterion("from_name is null"); + return (Criteria) this; + } + + public Criteria andFromNameIsNotNull() { + addCriterion("from_name is not null"); + return (Criteria) this; + } + + public Criteria andFromNameEqualTo(String value) { + addCriterion("from_name =", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameNotEqualTo(String value) { + addCriterion("from_name <>", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameGreaterThan(String value) { + addCriterion("from_name >", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameGreaterThanOrEqualTo(String value) { + addCriterion("from_name >=", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameLessThan(String value) { + addCriterion("from_name <", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameLessThanOrEqualTo(String value) { + addCriterion("from_name <=", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameLike(String value) { + addCriterion("from_name like", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameNotLike(String value) { + addCriterion("from_name not like", value, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameIn(List values) { + addCriterion("from_name in", values, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameNotIn(List values) { + addCriterion("from_name not in", values, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameBetween(String value1, String value2) { + addCriterion("from_name between", value1, value2, "fromName"); + return (Criteria) this; + } + + public Criteria andFromNameNotBetween(String value1, String value2) { + addCriterion("from_name not between", value1, value2, "fromName"); + return (Criteria) this; + } + + public Criteria andToIdIsNull() { + addCriterion("to_id is null"); + return (Criteria) this; + } + + public Criteria andToIdIsNotNull() { + addCriterion("to_id is not null"); + return (Criteria) this; + } + + public Criteria andToIdEqualTo(String value) { + addCriterion("to_id =", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdNotEqualTo(String value) { + addCriterion("to_id <>", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdGreaterThan(String value) { + addCriterion("to_id >", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdGreaterThanOrEqualTo(String value) { + addCriterion("to_id >=", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdLessThan(String value) { + addCriterion("to_id <", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdLessThanOrEqualTo(String value) { + addCriterion("to_id <=", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdLike(String value) { + addCriterion("to_id like", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdNotLike(String value) { + addCriterion("to_id not like", value, "toId"); + return (Criteria) this; + } + + public Criteria andToIdIn(List values) { + addCriterion("to_id in", values, "toId"); + return (Criteria) this; + } + + public Criteria andToIdNotIn(List values) { + addCriterion("to_id not in", values, "toId"); + return (Criteria) this; + } + + public Criteria andToIdBetween(String value1, String value2) { + addCriterion("to_id between", value1, value2, "toId"); + return (Criteria) this; + } + + public Criteria andToIdNotBetween(String value1, String value2) { + addCriterion("to_id not between", value1, value2, "toId"); + return (Criteria) this; + } + + public Criteria andToNameIsNull() { + addCriterion("to_name is null"); + return (Criteria) this; + } + + public Criteria andToNameIsNotNull() { + addCriterion("to_name is not null"); + return (Criteria) this; + } + + public Criteria andToNameEqualTo(String value) { + addCriterion("to_name =", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameNotEqualTo(String value) { + addCriterion("to_name <>", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameGreaterThan(String value) { + addCriterion("to_name >", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameGreaterThanOrEqualTo(String value) { + addCriterion("to_name >=", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameLessThan(String value) { + addCriterion("to_name <", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameLessThanOrEqualTo(String value) { + addCriterion("to_name <=", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameLike(String value) { + addCriterion("to_name like", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameNotLike(String value) { + addCriterion("to_name not like", value, "toName"); + return (Criteria) this; + } + + public Criteria andToNameIn(List values) { + addCriterion("to_name in", values, "toName"); + return (Criteria) this; + } + + public Criteria andToNameNotIn(List values) { + addCriterion("to_name not in", values, "toName"); + return (Criteria) this; + } + + public Criteria andToNameBetween(String value1, String value2) { + addCriterion("to_name between", value1, value2, "toName"); + return (Criteria) this; + } + + public Criteria andToNameNotBetween(String value1, String value2) { + addCriterion("to_name not between", value1, value2, "toName"); + return (Criteria) this; + } + + public Criteria andTimeIsNull() { + addCriterion("time is null"); + return (Criteria) this; + } + + public Criteria andTimeIsNotNull() { + addCriterion("time is not null"); + return (Criteria) this; + } + + public Criteria andTimeEqualTo(Date value) { + addCriterion("time =", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotEqualTo(Date value) { + addCriterion("time <>", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThan(Date value) { + addCriterion("time >", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThanOrEqualTo(Date value) { + addCriterion("time >=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThan(Date value) { + addCriterion("time <", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThanOrEqualTo(Date value) { + addCriterion("time <=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeIn(List values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List values) { + addCriterion("time not in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeBetween(Date value1, Date value2) { + addCriterion("time between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotBetween(Date value1, Date value2) { + addCriterion("time not between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andMsgIsNull() { + addCriterion("msg is null"); + return (Criteria) this; + } + + public Criteria andMsgIsNotNull() { + addCriterion("msg is not null"); + return (Criteria) this; + } + + public Criteria andMsgEqualTo(String value) { + addCriterion("msg =", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotEqualTo(String value) { + addCriterion("msg <>", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgGreaterThan(String value) { + addCriterion("msg >", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgGreaterThanOrEqualTo(String value) { + addCriterion("msg >=", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgLessThan(String value) { + addCriterion("msg <", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgLessThanOrEqualTo(String value) { + addCriterion("msg <=", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgLike(String value) { + addCriterion("msg like", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotLike(String value) { + addCriterion("msg not like", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgIn(List values) { + addCriterion("msg in", values, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotIn(List values) { + addCriterion("msg not in", values, "msg"); + return (Criteria) this; + } + + public Criteria andMsgBetween(String value1, String value2) { + addCriterion("msg between", value1, value2, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotBetween(String value1, String value2) { + addCriterion("msg not between", value1, value2, "msg"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(String value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(String value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(String value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(String value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(String value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(String value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLike(String value) { + addCriterion("status like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotLike(String value) { + addCriterion("status not like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(String value1, String value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(String value1, String value2) { + addCriterion("status not between", value1, value2, "status"); + 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); + } + } +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendance.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendance.java index c171531..843e217 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendance.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendance.java @@ -18,6 +18,10 @@ public class TbAttendance implements Serializable { private Integer goal; + private String sleep; + + private Integer headupScore; + private static final long serialVersionUID = 1L; public String getAttendanceId() { @@ -75,4 +79,20 @@ public Integer getGoal() { public void setGoal(Integer goal) { this.goal = goal; } + + public String getSleep() { + return sleep; + } + + public void setSleep(String sleep) { + this.sleep = sleep == null ? null : sleep.trim(); + } + + public Integer getHeadupScore() { + return headupScore; + } + + public void setHeadupScore(Integer headupScore) { + this.headupScore = headupScore; + } } \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendanceExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendanceExample.java index 7c9d9a8..b7c9b8c 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendanceExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbAttendanceExample.java @@ -564,6 +564,136 @@ public Criteria andGoalNotBetween(Integer value1, Integer value2) { addCriterion("goal not between", value1, value2, "goal"); return (Criteria) this; } + + public Criteria andSleepIsNull() { + addCriterion("sleep is null"); + return (Criteria) this; + } + + public Criteria andSleepIsNotNull() { + addCriterion("sleep is not null"); + return (Criteria) this; + } + + public Criteria andSleepEqualTo(String value) { + addCriterion("sleep =", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepNotEqualTo(String value) { + addCriterion("sleep <>", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepGreaterThan(String value) { + addCriterion("sleep >", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepGreaterThanOrEqualTo(String value) { + addCriterion("sleep >=", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepLessThan(String value) { + addCriterion("sleep <", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepLessThanOrEqualTo(String value) { + addCriterion("sleep <=", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepLike(String value) { + addCriterion("sleep like", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepNotLike(String value) { + addCriterion("sleep not like", value, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepIn(List values) { + addCriterion("sleep in", values, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepNotIn(List values) { + addCriterion("sleep not in", values, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepBetween(String value1, String value2) { + addCriterion("sleep between", value1, value2, "sleep"); + return (Criteria) this; + } + + public Criteria andSleepNotBetween(String value1, String value2) { + addCriterion("sleep not between", value1, value2, "sleep"); + return (Criteria) this; + } + + public Criteria andHeadupScoreIsNull() { + addCriterion("headup_score is null"); + return (Criteria) this; + } + + public Criteria andHeadupScoreIsNotNull() { + addCriterion("headup_score is not null"); + return (Criteria) this; + } + + public Criteria andHeadupScoreEqualTo(Integer value) { + addCriterion("headup_score =", value, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreNotEqualTo(Integer value) { + addCriterion("headup_score <>", value, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreGreaterThan(Integer value) { + addCriterion("headup_score >", value, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreGreaterThanOrEqualTo(Integer value) { + addCriterion("headup_score >=", value, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreLessThan(Integer value) { + addCriterion("headup_score <", value, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreLessThanOrEqualTo(Integer value) { + addCriterion("headup_score <=", value, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreIn(List values) { + addCriterion("headup_score in", values, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreNotIn(List values) { + addCriterion("headup_score not in", values, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreBetween(Integer value1, Integer value2) { + addCriterion("headup_score between", value1, value2, "headupScore"); + return (Criteria) this; + } + + public Criteria andHeadupScoreNotBetween(Integer value1, Integer value2) { + addCriterion("headup_score not between", value1, value2, "headupScore"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassExample.java index 9200d08..4bb7b6c 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbClassExample { +public class TbClassExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassitemExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassitemExample.java index d88cba1..448f66c 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassitemExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassitemExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbClassitemExample { +public class TbClassitemExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassroomExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassroomExample.java index 87c8eed..d38b107 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassroomExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbClassroomExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbClassroomExample { +public class TbClassroomExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeExample.java index e4fc935..6e1a1d7 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbCollegeExample { +public class TbCollegeExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeitemExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeitemExample.java index 1e5d48b..20fa5fb 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeitemExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCollegeitemExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbCollegeitemExample { +public class TbCollegeitemExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourse.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourse.java index f6542a5..edb06ed 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourse.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourse.java @@ -7,7 +7,7 @@ public class TbCourse implements Serializable { private String name; - private Integer year; + private String year; private String semeter; @@ -41,12 +41,12 @@ public void setName(String name) { this.name = name == null ? null : name.trim(); } - public Integer getYear() { + public String getYear() { return year; } - public void setYear(Integer year) { - this.year = year; + public void setYear(String year) { + this.year = year == null ? null : year.trim(); } public String getSemeter() { diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseClassExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseClassExample.java index f737276..d12fac2 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseClassExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseClassExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbCourseClassExample { +public class TbCourseClassExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseExample.java index b7ca05c..491e42f 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbCourseExample { +public class TbCourseExample implements Serializable { protected String orderByClause; protected boolean distinct; @@ -254,52 +255,62 @@ public Criteria andYearIsNotNull() { return (Criteria) this; } - public Criteria andYearEqualTo(Integer value) { + public Criteria andYearEqualTo(String value) { addCriterion("year =", value, "year"); return (Criteria) this; } - public Criteria andYearNotEqualTo(Integer value) { + public Criteria andYearNotEqualTo(String value) { addCriterion("year <>", value, "year"); return (Criteria) this; } - public Criteria andYearGreaterThan(Integer value) { + public Criteria andYearGreaterThan(String value) { addCriterion("year >", value, "year"); return (Criteria) this; } - public Criteria andYearGreaterThanOrEqualTo(Integer value) { + public Criteria andYearGreaterThanOrEqualTo(String value) { addCriterion("year >=", value, "year"); return (Criteria) this; } - public Criteria andYearLessThan(Integer value) { + public Criteria andYearLessThan(String value) { addCriterion("year <", value, "year"); return (Criteria) this; } - public Criteria andYearLessThanOrEqualTo(Integer value) { + public Criteria andYearLessThanOrEqualTo(String value) { addCriterion("year <=", value, "year"); return (Criteria) this; } - public Criteria andYearIn(List values) { + public Criteria andYearLike(String value) { + addCriterion("year like", value, "year"); + return (Criteria) this; + } + + public Criteria andYearNotLike(String value) { + addCriterion("year not like", value, "year"); + return (Criteria) this; + } + + public Criteria andYearIn(List values) { addCriterion("year in", values, "year"); return (Criteria) this; } - public Criteria andYearNotIn(List values) { + public Criteria andYearNotIn(List values) { addCriterion("year not in", values, "year"); return (Criteria) this; } - public Criteria andYearBetween(Integer value1, Integer value2) { + public Criteria andYearBetween(String value1, String value2) { addCriterion("year between", value1, value2, "year"); return (Criteria) this; } - public Criteria andYearNotBetween(Integer value1, Integer value2) { + public Criteria andYearNotBetween(String value1, String value2) { addCriterion("year not between", value1, value2, "year"); return (Criteria) this; } diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseTeacherExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseTeacherExample.java index 7b8ec2b..fc33b95 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseTeacherExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseTeacherExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbCourseTeacherExample { +public class TbCourseTeacherExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemExample.java index a155a17..502c3a6 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemExample.java @@ -1,10 +1,11 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -public class TbCourseitemExample { +public class TbCourseitemExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemHomework.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemHomework.java new file mode 100644 index 0000000..ed29849 --- /dev/null +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemHomework.java @@ -0,0 +1,58 @@ +package com.smart.pojo; + +import java.io.Serializable; +import java.util.Date; + +public class TbCourseitemHomework implements Serializable { + private String courseitemId; + + private String studentId; + + private Date uploadTime; + + private Date updateTime; + + private String homeworkUrl; + + private static final long serialVersionUID = 1L; + + public String getCourseitemId() { + return courseitemId; + } + + public void setCourseitemId(String courseitemId) { + this.courseitemId = courseitemId == null ? null : courseitemId.trim(); + } + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId == null ? null : studentId.trim(); + } + + public Date getUploadTime() { + return uploadTime; + } + + public void setUploadTime(Date uploadTime) { + this.uploadTime = uploadTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getHomeworkUrl() { + return homeworkUrl; + } + + public void setHomeworkUrl(String homeworkUrl) { + this.homeworkUrl = homeworkUrl == null ? null : homeworkUrl.trim(); + } +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemHomeworkExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemHomeworkExample.java new file mode 100644 index 0000000..daf47f9 --- /dev/null +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemHomeworkExample.java @@ -0,0 +1,532 @@ +package com.smart.pojo; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbCourseitemHomeworkExample implements Serializable { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbCourseitemHomeworkExample() { + oredCriteria = new ArrayList(); + } + + 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 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; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 andCourseitemIdIsNull() { + addCriterion("courseitem_id is null"); + return (Criteria) this; + } + + public Criteria andCourseitemIdIsNotNull() { + addCriterion("courseitem_id is not null"); + return (Criteria) this; + } + + public Criteria andCourseitemIdEqualTo(String value) { + addCriterion("courseitem_id =", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotEqualTo(String value) { + addCriterion("courseitem_id <>", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdGreaterThan(String value) { + addCriterion("courseitem_id >", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdGreaterThanOrEqualTo(String value) { + addCriterion("courseitem_id >=", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdLessThan(String value) { + addCriterion("courseitem_id <", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdLessThanOrEqualTo(String value) { + addCriterion("courseitem_id <=", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdLike(String value) { + addCriterion("courseitem_id like", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotLike(String value) { + addCriterion("courseitem_id not like", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdIn(List values) { + addCriterion("courseitem_id in", values, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotIn(List values) { + addCriterion("courseitem_id not in", values, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdBetween(String value1, String value2) { + addCriterion("courseitem_id between", value1, value2, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotBetween(String value1, String value2) { + addCriterion("courseitem_id not between", value1, value2, "courseitemId"); + return (Criteria) this; + } + + public Criteria andStudentIdIsNull() { + addCriterion("student_id is null"); + return (Criteria) this; + } + + public Criteria andStudentIdIsNotNull() { + addCriterion("student_id is not null"); + return (Criteria) this; + } + + public Criteria andStudentIdEqualTo(String value) { + addCriterion("student_id =", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdNotEqualTo(String value) { + addCriterion("student_id <>", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdGreaterThan(String value) { + addCriterion("student_id >", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdGreaterThanOrEqualTo(String value) { + addCriterion("student_id >=", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdLessThan(String value) { + addCriterion("student_id <", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdLessThanOrEqualTo(String value) { + addCriterion("student_id <=", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdLike(String value) { + addCriterion("student_id like", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdNotLike(String value) { + addCriterion("student_id not like", value, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdIn(List values) { + addCriterion("student_id in", values, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdNotIn(List values) { + addCriterion("student_id not in", values, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdBetween(String value1, String value2) { + addCriterion("student_id between", value1, value2, "studentId"); + return (Criteria) this; + } + + public Criteria andStudentIdNotBetween(String value1, String value2) { + addCriterion("student_id not between", value1, value2, "studentId"); + return (Criteria) this; + } + + public Criteria andUploadTimeIsNull() { + addCriterion("upload_time is null"); + return (Criteria) this; + } + + public Criteria andUploadTimeIsNotNull() { + addCriterion("upload_time is not null"); + return (Criteria) this; + } + + public Criteria andUploadTimeEqualTo(Date value) { + addCriterion("upload_time =", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeNotEqualTo(Date value) { + addCriterion("upload_time <>", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeGreaterThan(Date value) { + addCriterion("upload_time >", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeGreaterThanOrEqualTo(Date value) { + addCriterion("upload_time >=", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeLessThan(Date value) { + addCriterion("upload_time <", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeLessThanOrEqualTo(Date value) { + addCriterion("upload_time <=", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeIn(List values) { + addCriterion("upload_time in", values, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeNotIn(List values) { + addCriterion("upload_time not in", values, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeBetween(Date value1, Date value2) { + addCriterion("upload_time between", value1, value2, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeNotBetween(Date value1, Date value2) { + addCriterion("upload_time not between", value1, value2, "uploadTime"); + 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(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlIsNull() { + addCriterion("homework_url is null"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlIsNotNull() { + addCriterion("homework_url is not null"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlEqualTo(String value) { + addCriterion("homework_url =", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlNotEqualTo(String value) { + addCriterion("homework_url <>", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlGreaterThan(String value) { + addCriterion("homework_url >", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlGreaterThanOrEqualTo(String value) { + addCriterion("homework_url >=", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlLessThan(String value) { + addCriterion("homework_url <", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlLessThanOrEqualTo(String value) { + addCriterion("homework_url <=", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlLike(String value) { + addCriterion("homework_url like", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlNotLike(String value) { + addCriterion("homework_url not like", value, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlIn(List values) { + addCriterion("homework_url in", values, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlNotIn(List values) { + addCriterion("homework_url not in", values, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlBetween(String value1, String value2) { + addCriterion("homework_url between", value1, value2, "homeworkUrl"); + return (Criteria) this; + } + + public Criteria andHomeworkUrlNotBetween(String value1, String value2) { + addCriterion("homework_url not between", value1, value2, "homeworkUrl"); + 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); + } + } +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemPpt.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemPpt.java new file mode 100644 index 0000000..e6b7f34 --- /dev/null +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemPpt.java @@ -0,0 +1,48 @@ +package com.smart.pojo; + +import java.io.Serializable; +import java.util.Date; + +public class TbCourseitemPpt implements Serializable { + private String courseitemId; + + private Date uploadTime; + + private Date updateTime; + + private String fileUrl; + + private static final long serialVersionUID = 1L; + + public String getCourseitemId() { + return courseitemId; + } + + public void setCourseitemId(String courseitemId) { + this.courseitemId = courseitemId == null ? null : courseitemId.trim(); + } + + public Date getUploadTime() { + return uploadTime; + } + + public void setUploadTime(Date uploadTime) { + this.uploadTime = uploadTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl == null ? null : fileUrl.trim(); + } +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemPptExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemPptExample.java new file mode 100644 index 0000000..bf69e10 --- /dev/null +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbCourseitemPptExample.java @@ -0,0 +1,462 @@ +package com.smart.pojo; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbCourseitemPptExample implements Serializable { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbCourseitemPptExample() { + oredCriteria = new ArrayList(); + } + + 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 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; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 andCourseitemIdIsNull() { + addCriterion("courseitem_id is null"); + return (Criteria) this; + } + + public Criteria andCourseitemIdIsNotNull() { + addCriterion("courseitem_id is not null"); + return (Criteria) this; + } + + public Criteria andCourseitemIdEqualTo(String value) { + addCriterion("courseitem_id =", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotEqualTo(String value) { + addCriterion("courseitem_id <>", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdGreaterThan(String value) { + addCriterion("courseitem_id >", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdGreaterThanOrEqualTo(String value) { + addCriterion("courseitem_id >=", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdLessThan(String value) { + addCriterion("courseitem_id <", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdLessThanOrEqualTo(String value) { + addCriterion("courseitem_id <=", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdLike(String value) { + addCriterion("courseitem_id like", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotLike(String value) { + addCriterion("courseitem_id not like", value, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdIn(List values) { + addCriterion("courseitem_id in", values, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotIn(List values) { + addCriterion("courseitem_id not in", values, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdBetween(String value1, String value2) { + addCriterion("courseitem_id between", value1, value2, "courseitemId"); + return (Criteria) this; + } + + public Criteria andCourseitemIdNotBetween(String value1, String value2) { + addCriterion("courseitem_id not between", value1, value2, "courseitemId"); + return (Criteria) this; + } + + public Criteria andUploadTimeIsNull() { + addCriterion("upload_time is null"); + return (Criteria) this; + } + + public Criteria andUploadTimeIsNotNull() { + addCriterion("upload_time is not null"); + return (Criteria) this; + } + + public Criteria andUploadTimeEqualTo(Date value) { + addCriterion("upload_time =", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeNotEqualTo(Date value) { + addCriterion("upload_time <>", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeGreaterThan(Date value) { + addCriterion("upload_time >", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeGreaterThanOrEqualTo(Date value) { + addCriterion("upload_time >=", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeLessThan(Date value) { + addCriterion("upload_time <", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeLessThanOrEqualTo(Date value) { + addCriterion("upload_time <=", value, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeIn(List values) { + addCriterion("upload_time in", values, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeNotIn(List values) { + addCriterion("upload_time not in", values, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeBetween(Date value1, Date value2) { + addCriterion("upload_time between", value1, value2, "uploadTime"); + return (Criteria) this; + } + + public Criteria andUploadTimeNotBetween(Date value1, Date value2) { + addCriterion("upload_time not between", value1, value2, "uploadTime"); + 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(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andFileUrlIsNull() { + addCriterion("file_url is null"); + return (Criteria) this; + } + + public Criteria andFileUrlIsNotNull() { + addCriterion("file_url is not null"); + return (Criteria) this; + } + + public Criteria andFileUrlEqualTo(String value) { + addCriterion("file_url =", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlNotEqualTo(String value) { + addCriterion("file_url <>", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlGreaterThan(String value) { + addCriterion("file_url >", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlGreaterThanOrEqualTo(String value) { + addCriterion("file_url >=", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlLessThan(String value) { + addCriterion("file_url <", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlLessThanOrEqualTo(String value) { + addCriterion("file_url <=", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlLike(String value) { + addCriterion("file_url like", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlNotLike(String value) { + addCriterion("file_url not like", value, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlIn(List values) { + addCriterion("file_url in", values, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlNotIn(List values) { + addCriterion("file_url not in", values, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlBetween(String value1, String value2) { + addCriterion("file_url between", value1, value2, "fileUrl"); + return (Criteria) this; + } + + public Criteria andFileUrlNotBetween(String value1, String value2) { + addCriterion("file_url not between", value1, value2, "fileUrl"); + 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); + } + } +} \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbOfficerExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbOfficerExample.java index d66f3c7..7ce0ba1 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbOfficerExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbOfficerExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbOfficerExample { +public class TbOfficerExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbPositionExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbPositionExample.java index f084471..d4aa212 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbPositionExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbPositionExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbPositionExample { +public class TbPositionExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionExample.java index c56b73d..c6d1db2 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbProfessionExample { +public class TbProfessionExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionitemExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionitemExample.java index d5eb2c5..6f20c47 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionitemExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbProfessionitemExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbProfessionitemExample { +public class TbProfessionitemExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudent.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudent.java index dce399e..7b65561 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudent.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudent.java @@ -25,6 +25,8 @@ public class TbStudent implements Serializable { private String email; + private String identityId; + private static final long serialVersionUID = 1L; public String getId() { @@ -114,4 +116,31 @@ public String getEmail() { public void setEmail(String email) { this.email = email == null ? null : email.trim(); } + + public String getIdentityId() { + return identityId; + } + + public void setIdentityId(String identityId) { + this.identityId = identityId == null ? null : identityId.trim(); + + } + + @Override + public String toString() { + return "TbStudent{" + + "id='" + id + '\'' + + ", name='" + name + '\'' + + ", sex='" + sex + '\'' + + ", picture='" + picture + '\'' + + ", classId='" + classId + '\'' + + ", professionId='" + professionId + '\'' + + ", collegeId='" + collegeId + '\'' + + ", password='" + password + '\'' + + ", wexinId='" + wexinId + '\'' + + ", phoneCode='" + phoneCode + '\'' + + ", email='" + email + '\'' + + ", identityId='" + identityId + '\'' + + '}'; + } } \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudentExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudentExample.java index 90e1262..21aceb8 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudentExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbStudentExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbStudentExample { +public class TbStudentExample implements Serializable { protected String orderByClause; protected boolean distinct; @@ -873,6 +874,76 @@ public Criteria andEmailNotBetween(String value1, String value2) { addCriterion("email not between", value1, value2, "email"); return (Criteria) this; } + + public Criteria andIdentityIdIsNull() { + addCriterion("identity_id is null"); + return (Criteria) this; + } + + public Criteria andIdentityIdIsNotNull() { + addCriterion("identity_id is not null"); + return (Criteria) this; + } + + public Criteria andIdentityIdEqualTo(String value) { + addCriterion("identity_id =", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdNotEqualTo(String value) { + addCriterion("identity_id <>", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdGreaterThan(String value) { + addCriterion("identity_id >", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdGreaterThanOrEqualTo(String value) { + addCriterion("identity_id >=", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdLessThan(String value) { + addCriterion("identity_id <", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdLessThanOrEqualTo(String value) { + addCriterion("identity_id <=", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdLike(String value) { + addCriterion("identity_id like", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdNotLike(String value) { + addCriterion("identity_id not like", value, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdIn(List values) { + addCriterion("identity_id in", values, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdNotIn(List values) { + addCriterion("identity_id not in", values, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdBetween(String value1, String value2) { + addCriterion("identity_id between", value1, value2, "identityId"); + return (Criteria) this; + } + + public Criteria andIdentityIdNotBetween(String value1, String value2) { + addCriterion("identity_id not between", value1, value2, "identityId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbTeacherExample.java b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbTeacherExample.java index 8031e32..15d8c9d 100644 --- a/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbTeacherExample.java +++ b/wisdom_manager/wisdom_manager_pojo/src/main/java/com.smart/pojo/TbTeacherExample.java @@ -1,9 +1,10 @@ package com.smart.pojo; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class TbTeacherExample { +public class TbTeacherExample implements Serializable { protected String orderByClause; protected boolean distinct; diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendance.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendance.class deleted file mode 100644 index 74722a8..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendance.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criteria.class deleted file mode 100644 index 946a291..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criterion.class deleted file mode 100644 index 66c7733..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$GeneratedCriteria.class deleted file mode 100644 index 032eaa2..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample.class deleted file mode 100644 index 96aa196..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClass.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClass.class deleted file mode 100644 index 690c4c8..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClass.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criteria.class deleted file mode 100644 index d5a12fd..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criterion.class deleted file mode 100644 index d0abba9..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$GeneratedCriteria.class deleted file mode 100644 index fa228b6..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample.class deleted file mode 100644 index e875c9a..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitem.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitem.class deleted file mode 100644 index 115583c..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitem.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criteria.class deleted file mode 100644 index fe2cd3e..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criterion.class deleted file mode 100644 index 263f810..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$GeneratedCriteria.class deleted file mode 100644 index d31d24c..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample.class deleted file mode 100644 index a8752dc..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroom.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroom.class deleted file mode 100644 index 2d00996..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroom.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criteria.class deleted file mode 100644 index f494303..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criterion.class deleted file mode 100644 index 66a5e64..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$GeneratedCriteria.class deleted file mode 100644 index 3f92d56..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample.class deleted file mode 100644 index 44bd5d6..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollege.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollege.class deleted file mode 100644 index 97f8dfe..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollege.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criteria.class deleted file mode 100644 index ab052d4..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criterion.class deleted file mode 100644 index 9d3671f..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$GeneratedCriteria.class deleted file mode 100644 index 02a37ba..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample.class deleted file mode 100644 index 230faab..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitem.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitem.class deleted file mode 100644 index 028a83d..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitem.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criteria.class deleted file mode 100644 index 5d36521..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criterion.class deleted file mode 100644 index a1fd24e..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$GeneratedCriteria.class deleted file mode 100644 index 21f541a..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample.class deleted file mode 100644 index 1d58ded..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourse.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourse.class deleted file mode 100644 index 3b1c996..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourse.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClass.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClass.class deleted file mode 100644 index 18ccf6d..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClass.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criteria.class deleted file mode 100644 index ec655d8..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criterion.class deleted file mode 100644 index 2f7dc77..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$GeneratedCriteria.class deleted file mode 100644 index 257fe3a..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample.class deleted file mode 100644 index 0e648c3..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criteria.class deleted file mode 100644 index 8a02028..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criterion.class deleted file mode 100644 index 73ad0e7..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$GeneratedCriteria.class deleted file mode 100644 index a1a669b..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample.class deleted file mode 100644 index cf32ea1..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacher.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacher.class deleted file mode 100644 index 839f182..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacher.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criteria.class deleted file mode 100644 index e00e7cb..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criterion.class deleted file mode 100644 index bf6394f..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$GeneratedCriteria.class deleted file mode 100644 index d5f9f13..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample.class deleted file mode 100644 index 1cef02d..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitem.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitem.class deleted file mode 100644 index c6825d5..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitem.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criteria.class deleted file mode 100644 index 86e4436..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criterion.class deleted file mode 100644 index a45f763..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$GeneratedCriteria.class deleted file mode 100644 index 7c67a78..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample.class deleted file mode 100644 index 334330c..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficer.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficer.class deleted file mode 100644 index 9a1440e..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficer.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criteria.class deleted file mode 100644 index 7947414..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criterion.class deleted file mode 100644 index 899a188..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$GeneratedCriteria.class deleted file mode 100644 index ba15980..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample.class deleted file mode 100644 index f03cd9d..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPosition.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPosition.class deleted file mode 100644 index 497216a..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPosition.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criteria.class deleted file mode 100644 index 6657b09..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criterion.class deleted file mode 100644 index 3001ad2..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$GeneratedCriteria.class deleted file mode 100644 index 33962ec..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample.class deleted file mode 100644 index 1f16288..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfession.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfession.class deleted file mode 100644 index ef834e5..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfession.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criteria.class deleted file mode 100644 index f361512..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criterion.class deleted file mode 100644 index 30fac0f..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$GeneratedCriteria.class deleted file mode 100644 index 6785d47..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample.class deleted file mode 100644 index 77dab21..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitem.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitem.class deleted file mode 100644 index 4bfe478..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitem.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criteria.class deleted file mode 100644 index 1dc8481..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criterion.class deleted file mode 100644 index 40c37b9..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$GeneratedCriteria.class deleted file mode 100644 index cfed793..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample.class deleted file mode 100644 index e8864dd..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudent.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudent.class deleted file mode 100644 index fc4cb74..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudent.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criteria.class deleted file mode 100644 index d5b5e8f..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criterion.class deleted file mode 100644 index 6a02f53..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$GeneratedCriteria.class deleted file mode 100644 index a9a8df5..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample.class deleted file mode 100644 index 2362684..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacher.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacher.class deleted file mode 100644 index 596e589..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacher.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criteria.class deleted file mode 100644 index 6af9c79..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criterion.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criterion.class deleted file mode 100644 index 30f875f..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criterion.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$GeneratedCriteria.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$GeneratedCriteria.class deleted file mode 100644 index d6c62a2..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$GeneratedCriteria.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample.class b/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample.class deleted file mode 100644 index 069587d..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_pojo/target/maven-archiver/pom.properties b/wisdom_manager/wisdom_manager_pojo/target/maven-archiver/pom.properties deleted file mode 100644 index 10560c6..0000000 --- a/wisdom_manager/wisdom_manager_pojo/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 28 15:24:55 CST 2019 -version=1.0-SNAPSHOT -groupId=com.smart -artifactId=wisdom_manager_pojo diff --git a/wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 2b54150..0000000 --- a/wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,80 +0,0 @@ -com\smart\pojo\TbProfessionExample$Criterion.class -com\smart\pojo\TbCourseClassExample$GeneratedCriteria.class -com\smart\pojo\TbOfficerExample$Criteria.class -com\smart\pojo\TbAttendanceExample$GeneratedCriteria.class -com\smart\pojo\TbCourseitemExample$Criteria.class -com\smart\pojo\TbClassitemExample$Criterion.class -com\smart\pojo\TbTeacherExample$GeneratedCriteria.class -com\smart\pojo\TbCourseClassExample$Criterion.class -com\smart\pojo\TbCourseitemExample$GeneratedCriteria.class -com\smart\pojo\TbCollegeitemExample$Criterion.class -com\smart\pojo\TbOfficer.class -com\smart\pojo\TbAttendanceExample$Criterion.class -com\smart\pojo\TbClass.class -com\smart\pojo\TbPositionExample$Criterion.class -com\smart\pojo\TbAttendanceExample$Criteria.class -com\smart\pojo\TbCourseTeacherExample.class -com\smart\pojo\TbOfficerExample$GeneratedCriteria.class -com\smart\pojo\TbStudentExample$GeneratedCriteria.class -com\smart\pojo\TbStudentExample$Criterion.class -com\smart\pojo\TbProfessionExample$GeneratedCriteria.class -com\smart\pojo\TbCollegeitemExample$Criteria.class -com\smart\pojo\TbProfessionitemExample$GeneratedCriteria.class -com\smart\pojo\TbAttendanceExample.class -com\smart\pojo\TbTeacherExample$Criteria.class -com\smart\pojo\TbStudentExample.class -com\smart\pojo\TbClassroomExample.class -com\smart\pojo\TbCourseExample.class -com\smart\pojo\TbPositionExample$Criteria.class -com\smart\pojo\TbCourseExample$GeneratedCriteria.class -com\smart\pojo\TbCollegeitem.class -com\smart\pojo\TbCollegeitemExample$GeneratedCriteria.class -com\smart\pojo\TbCourseClass.class -com\smart\pojo\TbProfession.class -com\smart\pojo\TbProfessionitemExample$Criterion.class -com\smart\pojo\TbClassExample$GeneratedCriteria.class -com\smart\pojo\TbClassitemExample$GeneratedCriteria.class -com\smart\pojo\TbCollegeExample.class -com\smart\pojo\TbClassExample$Criteria.class -com\smart\pojo\TbClassroomExample$Criterion.class -com\smart\pojo\TbClassitemExample$Criteria.class -com\smart\pojo\TbTeacherExample$Criterion.class -com\smart\pojo\TbClassExample$Criterion.class -com\smart\pojo\TbPositionExample$GeneratedCriteria.class -com\smart\pojo\TbProfessionExample$Criteria.class -com\smart\pojo\TbClassroomExample$Criteria.class -com\smart\pojo\TbCourseitem.class -com\smart\pojo\TbCourseTeacher.class -com\smart\pojo\TbCollegeExample$Criterion.class -com\smart\pojo\TbStudentExample$Criteria.class -com\smart\pojo\TbAttendance.class -com\smart\pojo\TbCollegeExample$Criteria.class -com\smart\pojo\TbCollegeitemExample.class -com\smart\pojo\TbCourseExample$Criterion.class -com\smart\pojo\TbClassitem.class -com\smart\pojo\TbCourseTeacherExample$GeneratedCriteria.class -com\smart\pojo\TbProfessionExample.class -com\smart\pojo\TbPosition.class -com\smart\pojo\TbTeacherExample.class -com\smart\pojo\TbClassExample.class -com\smart\pojo\TbCourseExample$Criteria.class -com\smart\pojo\TbCollegeExample$GeneratedCriteria.class -com\smart\pojo\TbOfficerExample$Criterion.class -com\smart\pojo\TbStudent.class -com\smart\pojo\TbClassitemExample.class -com\smart\pojo\TbCourseTeacherExample$Criteria.class -com\smart\pojo\TbClassroomExample$GeneratedCriteria.class -com\smart\pojo\TbProfessionitem.class -com\smart\pojo\TbProfessionitemExample.class -com\smart\pojo\TbCourseClassExample$Criteria.class -com\smart\pojo\TbTeacher.class -com\smart\pojo\TbCourseTeacherExample$Criterion.class -com\smart\pojo\TbCollege.class -com\smart\pojo\TbPositionExample.class -com\smart\pojo\TbCourse.class -com\smart\pojo\TbCourseClassExample.class -com\smart\pojo\TbClassroom.class -com\smart\pojo\TbProfessionitemExample$Criteria.class -com\smart\pojo\TbCourseitemExample$Criterion.class -com\smart\pojo\TbOfficerExample.class -com\smart\pojo\TbCourseitemExample.class diff --git a/wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 1dfb89d..0000000 --- a/wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,32 +0,0 @@ -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbTeacherExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbClassExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbProfessionitem.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbClassitemExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCollegeitem.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbClass.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbTeacher.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbPosition.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbProfession.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseClassExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseitem.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbClassroomExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbOfficer.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCollegeitemExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbClassroom.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseClass.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbStudentExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbProfessionitemExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseTeacher.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbPositionExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseitemExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourse.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbAttendanceExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbProfessionExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbClassitem.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCollegeExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbOfficerExample.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbStudent.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbAttendance.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCollege.java -D:\IDEAworkspace\git_wisdom\wisdom_manager\wisdom_manager_pojo\src\main\java\com.smart\pojo\TbCourseTeacherExample.java diff --git a/wisdom_manager/wisdom_manager_pojo/target/wisdom_manager_pojo.jar b/wisdom_manager/wisdom_manager_pojo/target/wisdom_manager_pojo.jar deleted file mode 100644 index c652f61..0000000 Binary files a/wisdom_manager/wisdom_manager_pojo/target/wisdom_manager_pojo.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/pom.xml b/wisdom_manager/wisdom_manager_service/pom.xml index 5ae4352..650523b 100644 --- a/wisdom_manager/wisdom_manager_service/pom.xml +++ b/wisdom_manager/wisdom_manager_service/pom.xml @@ -23,6 +23,15 @@ + + com.alibaba + fastjson + 1.2.57 + + + com.squareup.okhttp3 + okhttp + com.smart @@ -30,12 +39,18 @@ 1.0-SNAPSHOT + com.smart wisdom_manager_dao 1.0-SNAPSHOT + + + org.springframework + spring-tx + org.springframework spring-context @@ -64,6 +79,7 @@ org.springframework spring-context-support + com.alibaba dubbo @@ -79,6 +95,10 @@ + + org.javassist + javassist + org.apache.zookeeper zookeeper diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/CourseCriticismServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/CourseCriticismServiceImpl.java new file mode 100644 index 0000000..6579a19 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/CourseCriticismServiceImpl.java @@ -0,0 +1,54 @@ +package com.smart.service.impl; + +import com.smart.mapper.TbAnswerQuestionMapper; +import com.smart.pojo.TbAnswerQuestion; +import com.smart.pojo.TbAnswerQuestionExample; +import com.smart.pojo.WisdomResult; +import com.smart.service.CourseCriticismService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.UUID; + +public class CourseCriticismServiceImpl implements CourseCriticismService { + + @Autowired + TbAnswerQuestionMapper tbAnswerQuestionMapper; + /** + * 添加一条留言 + * @param tbAnswerQuestion + * @return + */ + @Override + public WisdomResult addCriticism(TbAnswerQuestion tbAnswerQuestion) { + //生成一条id + UUID uuid = UUID.randomUUID(); + tbAnswerQuestion.setId(uuid.toString()); + int i = tbAnswerQuestionMapper.insert(tbAnswerQuestion); + if (i == 1){ + return WisdomResult.ok(); + } + return WisdomResult.errot("留言失败"); + } + + /** + * 通过课程id获得该节课程的评论 + * @param courseId 课程id + */ + @Override + public WisdomResult getCriticismListForOneCourse(String courseId) { + //设置查询 + TbAnswerQuestionExample tbAnswerQuestionExample = new TbAnswerQuestionExample(); + TbAnswerQuestionExample.Criteria criteria = tbAnswerQuestionExample.createCriteria(); + //先查询出根节点留言 + criteria.andFatherIdEqualTo(courseId); + //查出了根节点的留言节点 + List tbAnswerQuestions = tbAnswerQuestionMapper.selectByExample(tbAnswerQuestionExample); + //通过遍历把剩下的都查出来 + for (TbAnswerQuestion tbAnswerQuestion : tbAnswerQuestions) { + + } + + return null; + } +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/CourseServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/CourseServiceImpl.java new file mode 100644 index 0000000..7af3874 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/CourseServiceImpl.java @@ -0,0 +1,139 @@ +package com.smart.service.impl; + +import com.smart.service.CourseService; +import org.joda.time.DateTime; +import org.joda.time.Period; +import org.joda.time.PeriodType; +import org.junit.Test; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +@Service +public class CourseServiceImpl implements CourseService, Serializable { + private DateTime opentime;//开学时间 + private DateTime recessTime;//放假时间 + public CourseServiceImpl() { + opentime = new DateTime(2019,2,25,0,0); + recessTime = opentime.plusWeeks(20).minusDays(3); + } + + /** + * 开学时间 + * @return + */ + @Override + public DateTime getOpentime() { + return opentime; + } + + /** + * 放假时间 + * @return + */ + @Override + public DateTime getRecessTime() { + return getOpentime().plusWeeks(20); + } + + /** + * 获取某一天在该学期第几周 + */ + @Override + public Integer dayOfWeekInThisSemester(DateTime dateTime) { + //获取开学时间 + DateTime opentime = getOpentime(); + //获取开学时间为今年的第几周 + Period p2 = new Period(opentime, dateTime, PeriodType.yearWeekDay()); + return p2.getWeeks()+1; + } + + /** + * 获取该学期的第n周的区间 + * @return map集合 + */ + @Override + public Map getNWeekInThisSemester(int n) { + //获取该学时间 + DateTime opentime = getOpentime(); + //在开学日期上加n周 + DateTime targetWeek = opentime.plusWeeks(n-1); + //获取该周周一与周末 + DateTime targetWeekBegin = targetWeek.dayOfWeek().withMinimumValue(); + DateTime targetWeekEnd = targetWeek.dayOfWeek().withMaximumValue(); + //放进map + Map map = new HashMap<>(); + map.put("start",targetWeekBegin); + map.put("end",targetWeekEnd); + System.out.println(map); + System.out.println(1); + //返回 + return map; + } + + /** + * 某天为该学期的第几个月 + */ + @Override + public Integer dayOfMonthInThisSemester(DateTime dateTime) { + //获取开学时间 + DateTime opentime = getOpentime(); + //获取开学时间为今年的第几个月 + int i = dateTime.getMonthOfYear() - opentime.getMonthOfYear(); + return i+1; + } + + /** + * 获取该学期的第n个月的区间 + */ + @Override + public Map getNMonthInThisSemester(int n) { + Map map = new HashMap<>(); + DateTime begin; + DateTime end; + //如果是第一个月 + if (n == 1){ + //开始时间 + begin = opentime; + //结束时间 + end = opentime.dayOfMonth().withMaximumValue(); + }else { + DateTime targetTime = opentime.plusMonths(n - 1); + //月首 + begin = targetTime.dayOfMonth().withMinimumValue(); + //月末 + end = targetTime.dayOfMonth().withMaximumValue(); + //判断月末是否在学期外 + if (end.isAfter(recessTime)) { + end = recessTime; + } + } + //存入map + map.put("start",begin); + map.put("end",end); + return map; + } + + /** + * 该学期有几个月 + * @return + */ + @Override + public Integer monthInThisSemester() { + int i = recessTime.getMonthOfYear() - opentime.getMonthOfYear(); + return i + 1; + } + + + @Test + public void fun1(){ + DateTime dateTime = new DateTime(); + getNWeekInThisSemester(10); + Integer integer = dayOfMonthInThisSemester(dateTime); + System.out.println(integer); + getNMonthInThisSemester(6); + System.out.println("该学期有"+monthInThisSemester()+"个月"); + } +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentAttendanceServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentAttendanceServiceImpl.java new file mode 100644 index 0000000..f7574a3 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentAttendanceServiceImpl.java @@ -0,0 +1,563 @@ +package com.smart.service.impl; + + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.smart.mapper.TbStudentMapper; +import com.smart.pojo.*; +import com.smart.service.CourseService; +import com.smart.service.StudentAttendanceService; +import com.smart.utils.DateUtils; +import com.smart.utils.JsonUtils; +import com.smart.utils.StringToJsonSerializer; +import org.joda.time.DateTime; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.List; +import java.util.Map; + +@Service +public class StudentAttendanceServiceImpl implements StudentAttendanceService { + //定义时间格式 + @Value("yyyy-MM-dd HH:mm:ss") + private String DATE_FORMAT_TOSTRING ; + + @Autowired + private CourseService courseServiceImpl; + + @Autowired + private TbStudentMapper tbStudentMapper; + /** + * 通过起始时间获取某一个班的某一节课具体一段时间的考勤信息 + * @param start 开始时间 + * @param end 结束时间 + * @param classId 查询的学生信息 + * @param courseId 某一节课的id + * @return + */ + @Override + public WisdomResult getSpellTimeAttendance(String start, String end, String classId, String courseId) { + DateTime startTime = DateUtils.stringToDatetime(start); + DateTime endTime = DateUtils.stringToDatetime(end); + //获得到这段时间的课程的考勤信息 + List attendanceItems = tbStudentMapper.selectAttendanceItemByClassCourseStartEnd(classId, + courseId, startTime.toString(DATE_FORMAT_TOSTRING), endTime.toString(DATE_FORMAT_TOSTRING)); + return WisdomResult.ok(attendanceItems); + + } + + /** + * 通过起始时间与课程id查询这段时间中某位学生的某一节课的考勤情况 + * @param start 开始时间 + * @param end 结束时间 + * @param studentInfo 学生信息 + * @param courseId 课程id + */ + @Override + public WisdomResult getSpellTimeAttendanceOfOneCourse(String start, String end, StudentInfo studentInfo, String courseId) { + DateTime startTime = DateUtils.stringToDatetime(start); + DateTime endTime = DateUtils.stringToDatetime(end); + //获取这段时间的考勤信息 + List attendanceItems = tbStudentMapper.selectAttendanceItemByStudentCourseStartEnd(studentInfo.getId(), courseId, startTime.toString(DATE_FORMAT_TOSTRING), + endTime.toString(DATE_FORMAT_TOSTRING)); + //返回查询数据 + return WisdomResult.ok(attendanceItems); + } + + /** + * 上一个方法的重载 + */ + @Override + public WisdomResult getSpellTimeAttendanceOfOneCourse(DateTime start, DateTime end, StudentInfo studentInfo, String courseId) { + //获取这段时间的考勤信息 + List attendanceItems = tbStudentMapper.selectAttendanceItemByStudentCourseStartEnd(studentInfo.getId(), + courseId,start.toString(DATE_FORMAT_TOSTRING),end.toString(DATE_FORMAT_TOSTRING)); + //返回查询数据 + return WisdomResult.ok(attendanceItems); + } + + /** + * 本周某一节课的课程考勤 + * @param studentInfo 学生信息 + * @param courseId 某一节课程的id + */ + @Override + public WisdomResult getThisWeekAttendanceOfOneCourse(StudentInfo studentInfo, String courseId) { + //获取一下当前的事件 + DateTime currentTime = DateUtils.getCurrentTime(); + //计算出本周为该学期的第几个星期 + Integer weekInThisSemester = courseServiceImpl.dayOfWeekInThisSemester(currentTime); + //为本学期的第几个月 + Integer monthInThisSemester = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //使用当前时间推出本周的时间区间 + Map map = courseServiceImpl.getNWeekInThisSemester(weekInThisSemester); + return getSpellTimeAttendanceOfOneCourse(map.get("start"),map.get("end"),studentInfo,courseId); + } + + /** + * 上周某一节课的课程考勤 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + @Override + public WisdomResult getLastWeekAttendanceOfOneCourse(StudentInfo studentInfo, String courseId) { + //获取一下当前的事件 + DateTime currentTime = DateUtils.getCurrentTime(); + //计算出本周为该学期的第几个星期 + Integer weekInThisSemester = courseServiceImpl.dayOfWeekInThisSemester(currentTime); + //使用当前时间推出上周的时间区间 + Map map = courseServiceImpl.getNWeekInThisSemester(weekInThisSemester-1); + return getSpellTimeAttendanceOfOneCourse(map.get("start"),map.get("end"),studentInfo,courseId); + } + + /** + * 本月某一节课的课程考勤 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + @Override + public WisdomResult getThisMonthAttendanceOfOneCourse(StudentInfo studentInfo, String courseId) { + //获取一下当前的事件 + DateTime currentTime = DateUtils.getCurrentTime(); + //为本学期的第几个月 + Integer monthInThisSemester = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //使用当前时间推出本本的时间区间 + Map map = courseServiceImpl.getNMonthInThisSemester(monthInThisSemester); + return getSpellTimeAttendanceOfOneCourse(map.get("start"),map.get("end"),studentInfo,courseId); + } + + /** + * 上一个月某一节课的课程考勤 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + @Override + public WisdomResult getLastMonthAttendanceOfOneCourse(StudentInfo studentInfo, String courseId) { + //获取一下当前的事件 + DateTime currentTime = DateUtils.getCurrentTime(); + //为本学期的第几个月 + Integer monthInThisSemester = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //使用当前时间推出上月的时间区间 + Map map = courseServiceImpl.getNMonthInThisSemester(monthInThisSemester-1); + return getSpellTimeAttendanceOfOneCourse(map.get("start"),map.get("end"),studentInfo,courseId); + } + + /** + * 查询出该学生某一门课程从开学到现在的考勤 + * @param studentInfo 学生信息 + * @param courseId 某一节课的id + */ + @Override + public WisdomResult getThisSemesterAttendanceOfOneCourse(StudentInfo studentInfo, String courseId) { + //获取一下当前的事件 + DateTime currentTime = DateUtils.getCurrentTime(); + //获取开学时间 + DateTime opentime = courseServiceImpl.getOpentime(); + //返回查询结果 + return getSpellTimeAttendanceOfOneCourse(opentime,currentTime,studentInfo,courseId); + } + + + + + /** + * 查询该学生一段时间内的所有课程的考勤信息 + * @param start 开始时间 + * @param end 结束时间 + * @param studentInfo 学生信息 + * @return + */ + @Override + public WisdomResult getASpellTimeAttendanceOfAllCoourse(String start, String end, StudentInfo studentInfo) { + DateTime startDate = DateUtils.stringToDatetime(start); + DateTime endDate = DateUtils.stringToDatetime(end); + //查询数据结果 + return getASpellTimeAttendanceOfAllCoourse(startDate,endDate,studentInfo); + } + + /** + * 重载上面的方法 + */ + @Override + public WisdomResult getASpellTimeAttendanceOfAllCoourse(DateTime start, DateTime end, StudentInfo studentInfo) { + //查询数据结果 + List attendanceItems = tbStudentMapper.selectAttendanceItem(studentInfo.getId(), start.toString(DATE_FORMAT_TOSTRING), + end.toString(DATE_FORMAT_TOSTRING)); + return WisdomResult.ok(attendanceItems); + } + + /** + * 查询这个学生本星期所有课程的考勤信息 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getThisWeekAttendanceOfAllCoourse(StudentInfo studentInfo) { + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //查询这个星期的星期数 + Integer integer = courseServiceImpl.dayOfWeekInThisSemester(currentTime); + //获取该星期的起使 + Map map = courseServiceImpl.getNWeekInThisSemester(integer); + //返回结果 + return getASpellTimeAttendanceOfAllCoourse(map.get("start"),map.get("end"),studentInfo); + } + + /** + * 查询这个学生上个星期所有的课程的考勤信 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getLastWeekAttendanceOfAllCoourse(StudentInfo studentInfo) { + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //查询这个星期的星期数 + Integer integer = courseServiceImpl.dayOfWeekInThisSemester(currentTime); + //获取上星期的起使 + Map map = courseServiceImpl.getNWeekInThisSemester(integer-1); + //返回结果 + return getASpellTimeAttendanceOfAllCoourse(map.get("start"),map.get("end"),studentInfo); + } + + /** + * 查询这个学生本月的所有课程的考勤情况 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getThisMonthAttendanceOfAllCoourse(StudentInfo studentInfo) { + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //查询这个月为第几个月 + Integer integer = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //获取这个月的起使 + Map map = courseServiceImpl.getNMonthInThisSemester(integer); + //返回结果 + return getASpellTimeAttendanceOfAllCoourse(map.get("start"),map.get("end"),studentInfo); + } + + /** + * 查询这个学生生上个月的所有课程的考勤信息 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getLastMonthAttendanceOfAllCoourse(StudentInfo studentInfo) { + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //查询这个月为第几个月 + Integer integer = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //获取上月的起使 + Map map = courseServiceImpl.getNMonthInThisSemester(integer-1); + //返回结果 + return getASpellTimeAttendanceOfAllCoourse(map.get("start"),map.get("end"),studentInfo); + } + + /** + * 查询这个学生这个学期的所有课程的考勤信息 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getThisSemesterAttendanceOfAllCoourse(StudentInfo studentInfo) { + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //获取开学时间 + DateTime opentime = courseServiceImpl.getOpentime(); + //返回结果 + return getASpellTimeAttendanceOfAllCoourse(opentime,currentTime,studentInfo); + } + + /** + * ***************************************************************** + * 查询每天的考勤统计 + * 平均得分 几节课 哪一天 平均抬头率 + */ + + /** + * 传进来一段时间每天的大致考勤，将其在进行计算 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param list 大概考勤的链表 + */ + @Override + public WisdomResult calculateDaysAttendanceCollectList(DateTime startTime, DateTime endTime, List list) { + //计算出天数 + int num = DateUtils.twoDayGap(startTime,endTime); + //将list优化一下 + //将短时间的数据进行格式化 + DaysAttendanceCollectStatistic daysAttendanceCollectStatistic = + new DaysAttendanceCollectStatistic(num,list); + return WisdomResult.ok(daysAttendanceCollectStatistic); + } + + + /** + * 一段时间 + * @param studentInfo 学生信息 + * @param start 开始时间 + * @param end 结束时时间 + * @return + */ + @Override + public WisdomResult getASpellTimeProbableAttOfEveryday(StudentInfo studentInfo, String start, String end) { + DateTime startTime = DateUtils.stringToDatetime(start); + DateTime endTime = DateUtils.stringToDatetime(end); + //调用mapper查询 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(), startTime.toString(DATE_FORMAT_TOSTRING), + endTime.toString(DATE_FORMAT_TOSTRING)); + return calculateDaysAttendanceCollectList(startTime, endTime, list); + + } + + /** + * 上面的方法重载 + * @param studentInfo 学生信息 + * @param start 开始时间 + * @param end 结束时时间 + */ + @Override + public WisdomResult getASpellTimeProbableAttOfEveryday(StudentInfo studentInfo, DateTime start, DateTime end) { + //调用mapper查询 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(), start.toString(DATE_FORMAT_TOSTRING), + end.toString(DATE_FORMAT_TOSTRING)); + return calculateDaysAttendanceCollectList(start, end, list); + } + + /** + * 本周的大致考勤 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getThisWeekProbableAttOfEveryday(StudentInfo studentInfo) { + //计算出当前日期 + DateTime currentTime = DateUtils.getCurrentTime(); + //计算出这周为第几周 + Integer integer = courseServiceImpl.dayOfWeekInThisSemester(currentTime); + //计算出该周的起始 + Map map = courseServiceImpl.getNWeekInThisSemester(integer); + //调用mapper查询对应考勤 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(),map.get("start").toString(DATE_FORMAT_TOSTRING), + currentTime.toString(DATE_FORMAT_TOSTRING)); + //返回结果 + return calculateDaysAttendanceCollectList(map.get("start"),currentTime,list); + } + + /** + * 上一周的 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getLastWeekProbableAttOfEveryday(StudentInfo studentInfo) { + //计算出当前日期 + DateTime currentTime = DateUtils.getCurrentTime(); + //计算出这周为第几周 + Integer integer = courseServiceImpl.dayOfWeekInThisSemester(currentTime); + //计算出该周的起始 + Map map = courseServiceImpl.getNWeekInThisSemester(integer-1); + //调用mapper查询对应考勤 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(),map.get("start").toString(DATE_FORMAT_TOSTRING), + map.get("end").toString(DATE_FORMAT_TOSTRING)); + //返回结果 + return calculateDaysAttendanceCollectList(map.get("start"),map.get("end"),list); + } + + /** + * 计算这个月的 + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getThisMonthProbableAttOfEveryday(StudentInfo studentInfo) { + //计算出当前日期 + DateTime currentTime = DateUtils.getCurrentTime(); + //计算出这周为第几周 + Integer integer = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //计算出该周的起始 + Map map = courseServiceImpl.getNMonthInThisSemester(integer); + //调用mapper查询对应考勤 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(),map.get("start").toString(DATE_FORMAT_TOSTRING), + currentTime.toString(DATE_FORMAT_TOSTRING)); + //返回结果 + return calculateDaysAttendanceCollectList(map.get("start"),currentTime,list); + } + + /** + * 计算上个月的 + * @param studentInfo 学生信息 + * @return + */ + @Override + public WisdomResult getLastMonthProbableAttOfEveryday(StudentInfo studentInfo) { + //计算出当前日期 + DateTime currentTime = DateUtils.getCurrentTime(); + //计算出这周为第几周 + Integer integer = courseServiceImpl.dayOfMonthInThisSemester(currentTime); + //计算出该周的起始 + Map map = courseServiceImpl.getNMonthInThisSemester(integer-1); + //调用mapper查询对应考勤 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(),map.get("start").toString(DATE_FORMAT_TOSTRING), + map.get("end").toString(DATE_FORMAT_TOSTRING)); + //返回结果 + return calculateDaysAttendanceCollectList(map.get("start"), map.get("end"),list); + } + + /** + * 重载下面的方法 + */ + @Override + public WisdomResult getOneDayProbableAttOfEveryday(StudentInfo studentInfo, String oneday) { + DateTime dateTime = DateUtils.stringToDatetime(oneday); + return getOneDayProbableAttOfEveryday(studentInfo,dateTime); + } + + /** + * 计算出某一天的大概考勤 + * @param studentInfo 学生信息 + * @return + */ + @Override + public WisdomResult getOneDayProbableAttOfEveryday(StudentInfo studentInfo , DateTime oneday) { + //将改天的时间区间计算出来 + Map map = DateUtils.formatSpellTime(oneday); + //查询这段时间考勤信息 + return getASpellTimeProbableAttOfEveryday(studentInfo, map.get("start"), map.get("end")); + } + + /** + * 查询今天的 + * @param studentInfo 学生信息 + * @return + */ + @Override + public WisdomResult gettodayProbableAttOfEveryday(StudentInfo studentInfo) { + //获取当前时间 + DateTime time = DateUtils.getCurrentTime(); + //计算出今天的时间区间 + Map map = DateUtils.formatSpellTime(time); + //查询这段时间的考勤信息 + return getASpellTimeProbableAttOfEveryday(studentInfo,map.get("start"),time); + } + + /** + * 查询这个学生这个学期考勤信息 + * @param page + * @param size + * @param studentInfo 学生信息 + */ + @Override + public WisdomResult getThisSemesterProbableAttOfEveryday(Integer page, Integer size, StudentInfo studentInfo) { + //获取开学时间 + DateTime opentime = courseServiceImpl.getOpentime(); + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //第一次先查出来所有的 + List list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(), opentime.toString(DATE_FORMAT_TOSTRING), + currentTime.toString(DATE_FORMAT_TOSTRING)); + //计算出天数 + int num = DateUtils.twoDayGap(opentime,currentTime); + //将短时间的数据进行格式化 + DaysAttendanceCollectStatistic daysAttendanceCollectStatistic = + new DaysAttendanceCollectStatistic(num,list); + PageHelper.startPage(page,size); + //这次是查分页的 + list = tbStudentMapper.selectDaysAttendanceCollectByIDStartEnd(studentInfo.getId(), opentime.toString(DATE_FORMAT_TOSTRING), + currentTime.toString(DATE_FORMAT_TOSTRING)); + PageInfo pageInfo = new PageInfo<>(list) ; + //这里取出来分页的信息 + daysAttendanceCollectStatistic.setList(pageInfo.getList()); + //返回值 + return WisdomResult.ok(daysAttendanceCollectStatistic); + } + + /** + ********************************************************************************* + * 今天于昨天 + */ + @Override + public WisdomResult getYesterdayWithTodayAttDiff(StudentInfo studentInfo) { + DateTime currentTime = DateUtils.getCurrentTime(); + //获取今天的考勤信息 + WisdomResult wisdomResult = gettodayProbableAttOfEveryday(studentInfo); + //获取昨天 + DateTime dateTime = currentTime.minusDays(1); + WisdomResult oneDayProbableAttOfEveryday = getOneDayProbableAttOfEveryday(studentInfo, dateTime); + //计算差值 + return getASpellTimeAttDiff(wisdomResult, oneDayProbableAttOfEveryday); + } + + /** + * 计算俩个区间的差值 + * @return + */ + private WisdomResult getASpellTimeAttDiff(WisdomResult wisdomResult1, WisdomResult wisdomResult2) { + //取出数据 + DaysAttendanceCollectStatistic data = (DaysAttendanceCollectStatistic) wisdomResult1.getData(); + DaysAttendanceCollectStatistic data1 = (DaysAttendanceCollectStatistic) wisdomResult2.getData(); + System.out.println(data1.getAttendanceGoalAverage()); + System.out.println(data.getAttendanceGoalAverage()); + //计算插值 + double attDiff = 0; + try { + attDiff = Double.parseDouble(data.getAttendanceGoalAverage()) - Double.parseDouble(data1.getAttendanceGoalAverage()); + }catch (Exception e){ + attDiff = 0; + }finally { + double headuoDiff= 0; + try { + headuoDiff = Double.parseDouble(data.getHeadUpRateAverage()) - Double.parseDouble(data1.getHeadUpRateAverage()); + }catch (Exception e){ + headuoDiff = 0; + }finally { + JSONObject jsonObject = new JSONObject(); + //转成字符串 + String s1 = new DecimalFormat("0.0").format(attDiff); + String s2 = new DecimalFormat("0.00").format(headuoDiff); + //转成json + AttDiff attDiff1 = new AttDiff(); + attDiff1.setAttDiff(attDiff+""); + attDiff1.setHeadupDiff(headuoDiff+""); + attDiff1.setThisGrade(data.getAttendanceGoalAverage()); + attDiff1.setThisHeadup(data.getHeadUpRateAverage()); + return wisdomResult1.ok(attDiff1); + } + } + + + + } + + /** + 上个月和这个月 + */ + @Override + public WisdomResult getLastMonthWithThisMonthAttDiff(StudentInfo studentInfo) { + //获取这个月的大概考勤 + WisdomResult thisMonthProbableAttOfEveryday = getThisMonthProbableAttOfEveryday(studentInfo); + //获取上个月的大概考勤 + WisdomResult lastMonthProbableAttOfEveryday = getLastMonthProbableAttOfEveryday(studentInfo); + return getASpellTimeAttDiff(thisMonthProbableAttOfEveryday,lastMonthProbableAttOfEveryday); + } + + /** + * 上周和这周 + */ + @Override + + public WisdomResult getLastWeekWithThisWeekAttDiff(StudentInfo studentInfo) { + //获取这个月的考勤 + WisdomResult thisWeekProbableAttOfEveryday = getThisWeekProbableAttOfEveryday(studentInfo); + //获取上个月的考勤 + WisdomResult lastWeekProbableAttOfEveryday = getLastWeekProbableAttOfEveryday(studentInfo); + return getASpellTimeAttDiff(thisWeekProbableAttOfEveryday,lastWeekProbableAttOfEveryday); + } + + + @Test + public void fun(){ + String a = "\"123"; + String replace = a.replace("\\", ""); + System.out.println(replace); + } +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentCourseServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentCourseServiceImpl.java new file mode 100644 index 0000000..1d3e2d5 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentCourseServiceImpl.java @@ -0,0 +1,188 @@ +package com.smart.service.impl; + +import com.smart.mapper.TbStudentMapper; +import com.smart.pojo.StudentInfo; +import com.smart.pojo.WCourseInfo; +import com.smart.pojo.WisdomResult; +import com.smart.service.CourseService; +import com.smart.service.StudentCourseService; +import com.smart.utils.DateUtils; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +@Service +public class StudentCourseServiceImpl implements StudentCourseService, Serializable { + @Autowired + private CourseService courseService ; + //定义时间格式 + @Value("yyyy-MM-dd HH:mm:ss") + private String DATE_FORMAT_TOSTRING ; + + @Autowired + private TbStudentMapper tbStudentMapper; + /** + * 获取一段区间内的课程 + * @param studentInfo 要查询的学生 + * @param begin 开始时间 + * @param end 结束时间 + * @return + */ + @Override + public WisdomResult getCourseOfSpellTime(StudentInfo studentInfo, DateTime begin, DateTime end) { + List wCourseInfos = tbStudentMapper.selectWCourseInfo(studentInfo.getClassId(), begin.toString(DATE_FORMAT_TOSTRING), + end.toString(DATE_FORMAT_TOSTRING)); + return new WisdomResult(1,"true",wCourseInfos); + } + + /** + * @param begin 开始时间的字符串 + * @param end 结束时间的字符串 + */ + @Override + public WisdomResult getCourseOfSpellTime(StudentInfo studentInfo, String begin, String end) { + //进行格式转换 + DateTime startTime = DateUtils.stringToDatetime(begin); + DateTime endTime = DateUtils.stringToDatetime(end); + //返回结果集 + return getCourseOfSpellTime(studentInfo,startTime,endTime); + } + + @Override + public WisdomResult getCourseOfSpellTime(StudentInfo studentInfo, Map map) { + System.out.println(map); + List wCourseInfos = tbStudentMapper.selectWCourseInfo(studentInfo.getClassId(), map.get("start").toString(DATE_FORMAT_TOSTRING), + map.get("end").toString(DATE_FORMAT_TOSTRING)); + return new WisdomResult(1,"true",wCourseInfos); + } + + /** + * 某一天的课程 + * @param studentInfo 需要查询的学生 + * @param datetime 某一天的时间 + * @return + */ + @Override + public WisdomResult getCourseOfDay(StudentInfo studentInfo, DateTime datetime) { + //获取时间轴 + Map map = DateUtils.formatSpellTime(datetime); + //返回结果集 + return getCourseOfSpellTime(studentInfo,map); + } + + /*** + * @param day 字符串形式的时间 + */ + @Override + public WisdomResult getCourseOfDay(StudentInfo studentInfo, String day) { + + //进行格式转换 + DateTime dateTime = DateUtils.stringToDatetime(day); + //返回结果集 + return getCourseOfDay(studentInfo,dateTime); + } + + + /** + * 今天的课程 + */ + @Override + public WisdomResult getCourseOfToday(StudentInfo studentInfo) { + //获取当前时间 + DateTime currentTime = DateUtils.getCurrentTime(); + //获取时间段 + Map map = DateUtils.formatSpellTime(currentTime); + //返回结果集 + return getCourseOfSpellTime(studentInfo,map); + } + + /** + * 这个学期的课程 + */ + @Override + public WisdomResult getCourseOfThisSemester(StudentInfo studentInfo) { + //获取开学时间 + DateTime opentime = courseService.getOpentime(); + //获取放假时间 + DateTime recessTime = courseService.getRecessTime(); + //获取返回值 + return getCourseOfSpellTime(studentInfo,opentime,recessTime); + } + + /** + * 第n周的课程 + */ + @Override + public WisdomResult getCourseInXWeek(StudentInfo studentInfo, Integer n) { + //获取第n周的开始时间与结束时间 + Map map = courseService.getNWeekInThisSemester(n); + //获取结果 + return getCourseOfSpellTime(studentInfo,map); + } + + /** + * 获取这个星期的课程 + */ + @Override + public WisdomResult getCourseThisWeek(StudentInfo studentInfo) { + //获取这周为该学期的第几周 + Integer integer = courseService.dayOfWeekInThisSemester(DateUtils.getCurrentTime()); + //获取该周的开始时间与结束时间 + Map map = courseService.getNWeekInThisSemester(integer); + + //返回值 + return getCourseOfSpellTime(studentInfo,map); + } + + /** + * 获取该月的课程信息 + */ + @Override + public WisdomResult getCourseThisMonth(StudentInfo studentInfo) { + //获取本月为该学期地几个月 + Integer integer = courseService.dayOfMonthInThisSemester(DateUtils.getCurrentTime()); + //获取该月的起始时间 + Map map = courseService.getNMonthInThisSemester(integer); + //返回结果 + return getCourseOfSpellTime(studentInfo,map); + } + + /** + * 获取该学期第x个月的课程信息 + */ + @Override + public WisdomResult getCourseInXMonth(StudentInfo studentInfo, Integer n) { + //获取第x个月的起始时间 + Map map = courseService.getNMonthInThisSemester(n); + //返回结果 + return getCourseOfSpellTime(studentInfo,map); + } + + /** + * 该学生前n个月的课程信息 + */ + @Override + public WisdomResult getCourseFrontOfXMonth(StudentInfo studentInfo, Integer n) { + //获取该天前n个月的起始值 + Map map = DateUtils.subXMonthDay(DateUtils.getCurrentTime(), n); + //返回结果 + return getCourseOfSpellTime(studentInfo,map); + } + + /** + * 获取该学生前n个星期的课程信息 + */ + @Override + public WisdomResult getCourseFrontOfXWeek(StudentInfo studentInfo, Integer n) { + //获取该天前n个星期的起始值 + Map map = DateUtils.subXWeekDay(DateUtils.getCurrentTime(), n); + //返回结果集co + return getCourseOfSpellTime(studentInfo,map); + } + +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentLoginServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentLoginServiceImpl.java new file mode 100644 index 0000000..d9d1360 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/StudentLoginServiceImpl.java @@ -0,0 +1,53 @@ +package com.smart.service.impl; + +import com.smart.mapper.TbStudentMapper; +import com.smart.pojo.*; +import com.smart.service.StudentLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.List; + +@Service + +public class StudentLoginServiceImpl implements StudentLoginService, Serializable { + @Autowired + private TbStudentMapper tbStudentMapper ; + + + /** + * 通过对应tbS + */ + @Override + public WisdomResult studentLoginOfWeb(TbStudent tbStudent) { + + //查询结果 + StudentInfo studentInfo = tbStudentMapper.selectStudentIdAndPassword(tbStudent.getId(), tbStudent.getPassword()); + //查看查出来几条记录 + if (studentInfo != null){ + //1条记录则返回改记录所对应的pojo + WisdomResult result = WisdomResult.ok(studentInfo); + return result; + } + //不是一条记录返回false + return WisdomResult.build(0,"账号或密码错误"); + } + + @Override + public WisdomResult studentLoginOfWX(StudentInfo studentInfo) { + //拿到student以后，判断openid是不是在数据库中存在 + String openid = studentInfo.getWeixinId(); + //去数据库中查询是否存在 + studentInfo = tbStudentMapper.selectStudentInfo(openid); + //如果学生表中没有这个人 + if (studentInfo == null){ + return new WisdomResult(0,openid,null); + } + return new WisdomResult(1,openid,studentInfo); + } + + + + +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherAttendanceServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherAttendanceServiceImpl.java new file mode 100644 index 0000000..822fd36 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherAttendanceServiceImpl.java @@ -0,0 +1,218 @@ +package com.smart.service.impl; + +import com.smart.mapper.TbStudentMapper; +import com.smart.mapper.TbTeacherMapper; +import com.smart.pojo.*; +import com.smart.service.CourseService; +import com.smart.service.TeacherAttendanceService; +import com.smart.utils.DateUtils; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class TeacherAttendanceServiceImpl implements TeacherAttendanceService { + //定义时间格式 + @Value("yyyy-MM-dd HH:mm:ss") + private String DATE_FORMAT_TOSTRING ; + + @Autowired + private TbStudentMapper tbStudentMapper; + + @Autowired + private CourseService courseService; + + @Autowired + private TbTeacherMapper tbTeacherMapper; + /** + * 查询该学生一学期中该课程的考勤情况 + */ + @Override + public WisdomResult getStudentAttOfThisSemester(String courseId, String studentId) { + DateTime opentime = courseService.getOpentime(); + DateTime currentTime = DateUtils.getCurrentTime(); + List attendanceItems = tbStudentMapper.selectAttendanceItemByStudentCourseStartEnd(studentId, courseId, opentime.toString(DATE_FORMAT_TOSTRING), + currentTime.toString(DATE_FORMAT_TOSTRING)); + return WisdomResult.ok(attendanceItems); + } + + /** + * 通过课程id与学生id查询这节课他的考勤情况 + * @param start 开始时间 + * @param end 结束时间 + * @param courseId 课程id + * @param studentId 学生id + * @return + */ + @Override + public WisdomResult getStudentAbsentOfOneCourse(String start, String end, String courseId, String studentId) { + DateTime currentTime = DateUtils.getCurrentTime(); + Map map = DateUtils.formatSpellTime(currentTime); + + //获取今天的缺勤情况 + List attendanceSituations = tbTeacherMapper.queryAttendanceSituation("absent",start,end,courseId); + return WisdomResult.ok(attendanceSituations); + } + + + + /** + * + * @param classId 班级id + * @param courseId 课程id + * @return + */ + @Override + public WisdomResult getCourseAttOfClassToday(String classId, String courseId) { + + return null; + } + + /** + * 查询老师带的一段时间里面的课程 + * @param start 开始时间 + * @param end 结束时时间 + * @param teacherInfo 教师信息 + */ + @Override + public WisdomResult getAttASpellTime(String start, String end, TeacherInfo teacherInfo) { + //格式化时间 + DateTime startTime = DateUtils.stringToDatetime(start); + DateTime endTime = DateUtils.stringToDatetime(end); + return getAttASpellTime(startTime,endTime,teacherInfo); + } + + @Override + public WisdomResult getAttASpellTime(DateTime startTime, DateTime endTime, TeacherInfo teacherInfo) { + startTime = DateUtils.formatSpellTime(startTime).get("start"); + endTime = DateUtils.formatSpellTime(endTime).get("end"); + //创建一个list + List lists = new ArrayList<>(); + //把每天的课程结果都拿出 + while (!endTime.isEqual(startTime)){ + Map map = DateUtils.formatSpellTime(startTime); + //获取这段时间内的每节课的考勤信息 + List checkAttendances = tbStudentMapper.queryCheckAttendance(map.get("start").toString(DATE_FORMAT_TOSTRING), + map.get("end").toString(DATE_FORMAT_TOSTRING), teacherInfo.getId()); + //判断一下今天有没有课，没课就下一天 + if (checkAttendances == null || checkAttendances.size() == 0){ + System.out.println(map.get("start").toString("yyyy-mm-dd")+"没课"); + //将时间+1 + startTime = startTime.plusDays(1); + continue; + } + //对这节课进行分装,以及对信息进行初始化 + CheckAttendanceStatistic checkAttendanceStatistic = new CheckAttendanceStatistic(checkAttendances); + //将封装好的结果放进去 + lists.add(checkAttendanceStatistic); + System.out.println(map.get("start").toString("yyyy-mm-dd")); + //将时间+1 + startTime = startTime.plusDays(1); + } + //如果没课，返回没课 + if (lists.size() == 0) + return new WisdomResult(2,"今天没有课程",null); + return WisdomResult.ok(lists); + } + + /** + * 获取今天上课的考勤信息每一节课的考勤信息 + * @param teacherInfo 教师信息 + * @return + */ + @Override + public WisdomResult getAttToday(TeacherInfo teacherInfo) { + return getAttASpellTime(DateUtils.getCurrentTime(),DateUtils.getCurrentTime(),teacherInfo); + } + + /** + * 本周每节课的考勤信息 + * @param teacherInfo + * @return + */ + @Override + public WisdomResult getAttThisWeek(TeacherInfo teacherInfo) { + DateTime currentTime = DateUtils.getCurrentTime(); + Integer integer = courseService.dayOfWeekInThisSemester(currentTime); + Map nWeekInThisSemester = courseService.getNWeekInThisSemester(integer); + //获取这段时间的 + return getAttASpellTime(nWeekInThisSemester.get("start"), nWeekInThisSemester.get("end"), teacherInfo); + } + + /** + * 本月每节课的考勤信息 + * @param teacherInfo + * @return + */ + @Override + public WisdomResult getAttThisMont(TeacherInfo teacherInfo) { + DateTime dateTime = DateUtils.getCurrentTime(); + Integer integer = courseService.dayOfMonthInThisSemester(dateTime); + Map nMonthInThisSemester = courseService.getNMonthInThisSemester(integer); + return getAttASpellTime(nMonthInThisSemester.get("start"),nMonthInThisSemester.get("end"),teacherInfo); + } + + /** + * 这个学期每节课的考勤信息 + * @param teacherInfo + * @return + */ + @Override + public WisdomResult getAttThisSemester(TeacherInfo teacherInfo) { + DateTime opentime = courseService.getOpentime(); + DateTime currentTime = DateUtils.getCurrentTime(); + return getAttASpellTime(opentime,currentTime,teacherInfo); + } + + /** + * 某一天的考勤信息 + * @param day 某一天的时间 + * @return + */ + @Override + public WisdomResult getAttOfOneDay(String day , TeacherInfo teacherInfo) { + DateTime dateTime = DateUtils.stringToDatetime(day); + Map map = DateUtils.formatSpellTime(dateTime); + return getAttASpellTime(map.get("start"),map.get("end"),teacherInfo); + } + + /** + * 某一节课整个班级的考勤信息 + * @param crouseItemId 某一节课的id + */ + @Override + public WisdomResult getAttOfClass(String crouseItemId) { + List attendanceCourseItems = tbStudentMapper.queryAttendanceCourseItemByCourseitem_id(crouseItemId); + return WisdomResult.ok(attendanceCourseItems); + } + + /** + * 某一个学生这一学期这节课的考勤信息 + * @param studentId 学生信息 + * @param courseId 课程信息 + * @return + */ + @Override + public WisdomResult getStudentAttOfCourse(String studentId, String courseId) { + CourseAVGAttendance courseAVGAttendance = tbStudentMapper.queryCourseAVGAttendance(studentId, courseId); + return WisdomResult.ok(courseAVGAttendance); + } + + /** + * 查询这个学生这个学期每一节这个课都对应的考勤信息 + * @param studentId 学生id + * @param courseId 课程id + */ + @Override + public WisdomResult getStudentAttInEveryCourse(String studentId, String courseId) { + List attendanceCourseItems = tbStudentMapper.queryAttendanceCourseItemByStudentCourse(studentId, courseId); + return WisdomResult.ok(attendanceCourseItems); + } + + +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherCourseServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherCourseServiceImpl.java new file mode 100644 index 0000000..ec81c75 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherCourseServiceImpl.java @@ -0,0 +1,49 @@ +package com.smart.service.impl; + +import com.smart.mapper.TbCourseTeacherMapper; +import com.smart.mapper.TbStudentMapper; +import com.smart.mapper.TbTeacherMapper; +import com.smart.pojo.*; +import com.smart.service.TeacherCourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class TeacherCourseServiceImpl implements TeacherCourseService { + //定义时间格式 + @Value("yyyy-MM-dd HH:mm:ss") + private String DATE_FORMAT_TOSTRING ; + + @Autowired + private TbTeacherMapper tbTeacherMapper; + + @Autowired + private TbCourseTeacherMapper tbCourseTeacherMapper; + + @Autowired + private TbStudentMapper tbStudentMapper; + /** + * 查询这个老师有几门课 + */ + @Override + public WisdomResult getCourseNumOfTeacher(TeacherInfo teacherInfo) { + TbCourseTeacherExample tbCourseTeacherExample = new TbCourseTeacherExample(); + TbCourseTeacherExample.Criteria criteria = tbCourseTeacherExample.createCriteria(); + criteria.andTeacherIdEqualTo(teacherInfo.getId()); + long l = tbCourseTeacherMapper.countByExample(tbCourseTeacherExample); + return WisdomResult.ok(l); + } + + /** + * 同学学生学号查询学生个人信息 + */ + @Override + public WisdomResult getStudentInfo(String studentId) { + StudentInfo studentInfo = tbStudentMapper.selectStudentInfoById(studentId); + return WisdomResult.ok(studentInfo); + } + + + +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherLoginServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherLoginServiceImpl.java new file mode 100644 index 0000000..40e7438 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/TeacherLoginServiceImpl.java @@ -0,0 +1,47 @@ +package com.smart.service.impl; + +import com.smart.mapper.TbTeacherMapper; +import com.smart.pojo.*; +import com.smart.service.TeacherLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.List; + +@Service +public class TeacherLoginServiceImpl implements TeacherLoginService, Serializable { + + @Autowired + private TbTeacherMapper tbTeacherMapper; + + @Override + public WisdomResult teacherLoginOfWeb(TbTeacher tbTeacher) { + + //获取查询结果 + TeacherInfo teacherInfo = tbTeacherMapper.selectTeacherIdAndPassword(tbTeacher.getId(), tbTeacher.getPassword()); + //查看查出来几条记录 + if (teacherInfo != null){ + //1条记录则返回改记录所对应的pojo + WisdomResult result = new WisdomResult(2,"true",teacherInfo); + return result; + } + //不是一条记录返回false + return WisdomResult.build(0,"账号或密码错误"); + } + + @Override + public WisdomResult teacherLoginOfWX(TbTeacher tbTeacher) { + //拿到student以后，判断openid是不是在数据库中存在 + String openid = tbTeacher.getWexinId(); + //创建查询实例 + + //去数据库中查询是否存在 + TeacherInfo teacherInfo = tbTeacherMapper.selectTeacherInfo(tbTeacher.getWexinId()); + //如果学生表中没有这个人 + if (teacherInfo == null){ + return new WisdomResult(0,openid,null); + } + return new WisdomResult(2,openid,teacherInfo); + } +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/WXLoginServiceImpl.java b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/WXLoginServiceImpl.java new file mode 100644 index 0000000..2fd5123 --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/java/com/smart/service/impl/WXLoginServiceImpl.java @@ -0,0 +1,137 @@ +package com.smart.service.impl; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.smart.mapper.TbStudentMapper; +import com.smart.mapper.TbTeacherMapper; +import com.smart.pojo.*; + +import com.smart.service.StudentLoginService; +import com.smart.service.TeacherLoginService; +import com.smart.service.WXLoginService; +import okhttp3.Call; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.Map; + + +@Service("wXLoginServiceImpl") +public class WXLoginServiceImpl implements WXLoginService, Serializable { + @Autowired + private StudentLoginService studentLoginService; + + @Autowired + private TeacherLoginService teacherLoginService; + + @Autowired + private TbStudentMapper tbStudentMapper; + + @Autowired + private TbTeacherMapper tbTeacherMapper; + /** + * 进行登陆操作 + */ + @Override + public WisdomResult login(String appid, String secret, String js_code, String grant_type) throws Exception { + //定义一个标志，判断是学生还是老师 + //获取openid的url + String url = "https://api.weixin.qq.com/sns/jscode2session?appid="+appid+ + "&secret="+secret+ "&js_code="+js_code; + //判断最后一个参数是否存在，有的话加上 + if (grant_type != null) + url += "&grant_type="+grant_type; + //发送get请求 + OkHttpClient client = new OkHttpClient(); + Request request1 = new Request.Builder().url(url).get().build(); + Call call = client.newCall(request1); + //获取请求结果 + Response response = call.execute(); + //获取请求体字符串 + String json = response.body().string(); + ObjectMapper objectMapper = new ObjectMapper(); + //将json字符串转为map对象 + Map tmpMap = objectMapper.readValue(json, Map.class); + //将openid放进tbstudent + StudentInfo studentInfo = new StudentInfo(); + studentInfo.setWeixinId((String) tmpMap.get("openid")); + //将openid放进tbTeacher + TbTeacher tbTeacher = new TbTeacher(); + tbTeacher.setWexinId((String) tmpMap.get("openid")); + //调用俩个人的方法进行查询 + WisdomResult result = studentLoginService.studentLoginOfWX(studentInfo); + //判断一下是不是在学生中,不是再去老师中判断 + if (result.getStatus() == 0) { + result = teacherLoginService.teacherLoginOfWX(tbTeacher); + } + //判断一下是不是在老师中，如果不是在老师中，那么要告诉微信端这个人没有绑定 + if (result.getStatus() == 0 ) { + result = new WisdomResult(0,(String) tmpMap.get("openid"),null); + } + return result; + } + + @Override + public WisdomResult bindOpenidWithAccount(String openid, String account, String password ,int status) { + WisdomResult wisdomResult = null; + StudentInfo studentInfo; + int i = 0; + //判断是老师还是学生 + if (status == 1){ + //学生 + TbStudentExample tbStudentExample = new TbStudentExample(); + TbStudentExample.Criteria criteria = tbStudentExample.createCriteria(); + //添加条件 + criteria.andIdEqualTo(account); + criteria.andPasswordEqualTo(password); + //创建需要修改的实例 + TbStudent tbStudent = new TbStudent(); + tbStudent.setWexinId(openid); + //插入数据 + i = tbStudentMapper.updateByExampleSelective(tbStudent, tbStudentExample); + if (i == 1){ + //插入成功 + //取出这个学生个人信息 + studentInfo = tbStudentMapper.selectStudentIdAndPassword(account, password); + //返回结果 + return new WisdomResult(1,"true",studentInfo); + } + return new WisdomResult(0,"账号或密码错误",null); + }else { + //老师 + TbTeacherExample tbTeacherExample = new TbTeacherExample(); + TbTeacherExample.Criteria criteria = tbTeacherExample.createCriteria(); + //添加条件 + criteria.andIdEqualTo(account); + criteria.andPasswordEqualTo(password); + //创建需要修改的实例 + TbTeacher tbTeacher = new TbTeacher(); + tbTeacher.setWexinId(openid); + //插入数据 + i = tbTeacherMapper.updateByExampleSelective(tbTeacher, tbTeacherExample); + //判断是否插入成功 + if (i == 1){ + //插入成功 + //取出这个老师的个人信息 + + } + return new WisdomResult(0,"账号或密码错误",null); + } + } + + @Override + public String test() { + TbStudentExample tbStudentExample = new TbStudentExample(); + TbStudentExample.Criteria criteria = tbStudentExample.createCriteria(); + criteria.andIdEqualTo("41609050128"); + TbStudent tbStudent = new TbStudent(); + tbStudent.setPassword("00001"); + tbStudentMapper.updateByExampleSelective(tbStudent,tbStudentExample); + return "1"; + } + + +} diff --git a/wisdom_manager/wisdom_manager_service/src/main/resources/log4j.properties b/wisdom_manager/wisdom_manager_service/src/main/resources/log4j.properties new file mode 100644 index 0000000..654d55c --- /dev/null +++ b/wisdom_manager/wisdom_manager_service/src/main/resources/log4j.properties @@ -0,0 +1,18 @@ +#Set root category priority to INFO and its only appender to CONSOLE +#log4j.rooCategory=INFO,CONSOLE debug info warn error fatal +log4j.rootCategory=debug,CONSOLE,LOGFILE + +#Set the enterprise logger category to FATAL and its only appender to CONSOLE. +log4j.logger.org.apache.axis.enterprise=FATAL,CONSOLE + +#CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-6r [%15.15t] %-5p %30.30c %x - %m\n + +#CONSOLE is set to be a File appender +log4j.appender.LOGFILE=org.apache.log4j.FileAppender +log4j.appender.LOGFILE.File=/root +log4j.appender.LOGFILE.Append=true +log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout +log4j.appender.LOGFILE.layout.ConversionPattern=%d{ISO8601} %-6r [%15.15t] %-5p %30.30c %x - %m\n diff --git a/wisdom_manager/wisdom_manager_service/src/main/resources/properties/db.properties b/wisdom_manager/wisdom_manager_service/src/main/resources/properties/db.properties index bfe3093..bef787d 100644 --- a/wisdom_manager/wisdom_manager_service/src/main/resources/properties/db.properties +++ b/wisdom_manager/wisdom_manager_service/src/main/resources/properties/db.properties @@ -1,4 +1,4 @@ jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://47.103.14.73:3306/team_model?characterEncoding=utf-8 +jdbc.url=jdbc:mysql://101.132.78.78:3306/team_model?characterEncoding=utf-8 jdbc.username=root -jdbc.password=ndl.04551 \ No newline at end of file +jdbc.password=nanshen166013 \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-dao.xml b/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-dao.xml index 7010619..0095110 100644 --- a/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-dao.xml +++ b/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-dao.xml @@ -1,44 +1,28 @@ - - - - - - - - - - - - - - - + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + - - - - + + + + + + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-service.xml b/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-service.xml index b259f78..1d3030d 100644 --- a/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-service.xml +++ b/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-service.xml @@ -1,24 +1,13 @@ + xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p" + xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:dubbo="http://code.alibabatech.com/schema/dubbo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd"> @@ -30,5 +19,17 @@ + + + + + + + + + + + + diff --git a/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-transaction.xml b/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-transaction.xml index fe97876..69b47fb 100644 --- a/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-transaction.xml +++ b/wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-transaction.xml @@ -1,45 +1,43 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.2.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.2.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-3.2.xsd"> + + - + - + + - + diff --git a/wisdom_manager/wisdom_manager_service/src/main/webapp/WEB-INF/web.xml b/wisdom_manager/wisdom_manager_service/src/main/webapp/WEB-INF/web.xml index 9f88c1f..c912ffb 100644 --- a/wisdom_manager/wisdom_manager_service/src/main/webapp/WEB-INF/web.xml +++ b/wisdom_manager/wisdom_manager_service/src/main/webapp/WEB-INF/web.xml @@ -4,4 +4,30 @@ Archetype Created Web Application + + contextConfigLocation + classpath:spring/applicationContext-*.xml + + + + + characterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + + encoding + utf-8 + + + + characterEncodingFilter + /* + + + + + + org.springframework.web.context.ContextLoaderListener + + diff --git a/wisdom_manager/wisdom_manager_service/target/classes/mybatis/SqlMapConfig.xml b/wisdom_manager/wisdom_manager_service/target/classes/mybatis/SqlMapConfig.xml deleted file mode 100644 index 952806c..0000000 --- a/wisdom_manager/wisdom_manager_service/target/classes/mybatis/SqlMapConfig.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/classes/properties/db.properties b/wisdom_manager/wisdom_manager_service/target/classes/properties/db.properties deleted file mode 100644 index bfe3093..0000000 --- a/wisdom_manager/wisdom_manager_service/target/classes/properties/db.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://47.103.14.73:3306/team_model?characterEncoding=utf-8 -jdbc.username=root -jdbc.password=ndl.04551 \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/classes/properties/log4j.properties b/wisdom_manager/wisdom_manager_service/target/classes/properties/log4j.properties deleted file mode 100644 index 3802802..0000000 --- a/wisdom_manager/wisdom_manager_service/target/classes/properties/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=WARN,A1 -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c]-[%p] %m%n \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-dao.xml b/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-dao.xml deleted file mode 100644 index 7010619..0000000 --- a/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-dao.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-service.xml b/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-service.xml deleted file mode 100644 index b259f78..0000000 --- a/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-service.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-transaction.xml b/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-transaction.xml deleted file mode 100644 index fe97876..0000000 --- a/wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-transaction.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wisdom_manager/wisdom_manager_service/target/maven-archiver/pom.properties b/wisdom_manager/wisdom_manager_service/target/maven-archiver/pom.properties deleted file mode 100644 index bc04d54..0000000 --- a/wisdom_manager/wisdom_manager_service/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 28 15:24:56 CST 2019 -version=1.0-SNAPSHOT -groupId=com.smart -artifactId=wisdom_manager_service diff --git a/wisdom_manager/wisdom_manager_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/wisdom_manager/wisdom_manager_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/wisdom_manager/wisdom_manager_service/target/tomcat/conf/logging.properties b/wisdom_manager/wisdom_manager_service/target/tomcat/conf/logging.properties deleted file mode 100644 index 76c9512..0000000 --- a/wisdom_manager/wisdom_manager_service/target/tomcat/conf/logging.properties +++ /dev/null @@ -1,64 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -1catalina.org.apache.juli.FileHandler.level = FINE -1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -1catalina.org.apache.juli.FileHandler.prefix = catalina. - -2localhost.org.apache.juli.FileHandler.level = FINE -2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -2localhost.org.apache.juli.FileHandler.prefix = localhost. - -3manager.org.apache.juli.FileHandler.level = FINE -3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -3manager.org.apache.juli.FileHandler.prefix = manager. - -4host-manager.org.apache.juli.FileHandler.level = FINE -4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -4host-manager.org.apache.juli.FileHandler.prefix = host-manager. - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler - -# For example, set the org.apache.catalina.util.LifecycleBase logger to log -# each component that extends LifecycleBase changing state: -#org.apache.catalina.util.LifecycleBase.level = FINE - -# To see debug messages in TldLocationsCache, uncomment the following line: -#org.apache.jasper.compiler.TldLocationsCache.level = FINE diff --git a/wisdom_manager/wisdom_manager_service/target/tomcat/conf/tomcat-users.xml b/wisdom_manager/wisdom_manager_service/target/tomcat/conf/tomcat-users.xml deleted file mode 100644 index 7114f5d..0000000 --- a/wisdom_manager/wisdom_manager_service/target/tomcat/conf/tomcat-users.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/wisdom_manager/wisdom_manager_service/target/tomcat/conf/web.xml b/wisdom_manager/wisdom_manager_service/target/tomcat/conf/web.xml deleted file mode 100644 index cc8383c..0000000 --- a/wisdom_manager/wisdom_manager_service/target/tomcat/conf/web.xml +++ /dev/null @@ -1,4283 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - / - - - - - jsp - *.jsp - *.jspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - 123 - application/vnd.lotus-1-2-3 - - - 3dml - text/vnd.in3d.3dml - - - 3g2 - video/3gpp2 - - - 3gp - video/3gpp - - - 7z - application/x-7z-compressed - - - aab - application/x-authorware-bin - - - aac - audio/x-aac - - - aam - application/x-authorware-map - - - aas - application/x-authorware-seg - - - abs - audio/x-mpeg - - - abw - application/x-abiword - - - ac - application/pkix-attr-cert - - - acc - application/vnd.americandynamics.acc - - - ace - application/x-ace-compressed - - - acu - application/vnd.acucobol - - - acutc - application/vnd.acucorp - - - adp - audio/adpcm - - - aep - application/vnd.audiograph - - - afm - application/x-font-type1 - - - afp - application/vnd.ibm.modcap - - - ahead - application/vnd.ahead.space - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - air - application/vnd.adobe.air-application-installer-package+zip - - - ait - application/vnd.dvb.ait - - - ami - application/vnd.amiga.ami - - - anx - application/annodex - - - apk - application/vnd.android.package-archive - - - application - application/x-ms-application - - - apr - application/vnd.lotus-approach - - - art - image/x-jg - - - asc - application/pgp-signature - - - asf - video/x-ms-asf - - - asm - text/x-asm - - - aso - application/vnd.accpac.simply.aso - - - asx - video/x-ms-asf - - - atc - application/vnd.acucorp - - - atom - application/atom+xml - - - atomcat - application/atomcat+xml - - - atomsvc - application/atomsvc+xml - - - atx - application/vnd.antix.game-component - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - aw - application/applixware - - - axa - audio/annodex - - - axv - video/annodex - - - azf - application/vnd.airzip.filesecure.azf - - - azs - application/vnd.airzip.filesecure.azs - - - azw - application/vnd.amazon.ebook - - - bat - application/x-msdownload - - - bcpio - application/x-bcpio - - - bdf - application/x-font-bdf - - - bdm - application/vnd.syncml.dm+wbxml - - - bed - application/vnd.realvnc.bed - - - bh2 - application/vnd.fujitsu.oasysprs - - - bin - application/octet-stream - - - bmi - application/vnd.bmi - - - bmp - image/bmp - - - body - text/html - - - book - application/vnd.framemaker - - - box - application/vnd.previewsystems.box - - - boz - application/x-bzip2 - - - bpk - application/octet-stream - - - btif - image/prs.btif - - - bz - application/x-bzip - - - bz2 - application/x-bzip2 - - - c - text/x-c - - - c11amc - application/vnd.cluetrust.cartomobile-config - - - c11amz - application/vnd.cluetrust.cartomobile-config-pkg - - - c4d - application/vnd.clonk.c4group - - - c4f - application/vnd.clonk.c4group - - - c4g - application/vnd.clonk.c4group - - - c4p - application/vnd.clonk.c4group - - - c4u - application/vnd.clonk.c4group - - - cab - application/vnd.ms-cab-compressed - - - cap - application/vnd.tcpdump.pcap - - - car - application/vnd.curl.car - - - cat - application/vnd.ms-pki.seccat - - - cc - text/x-c - - - cct - application/x-director - - - ccxml - application/ccxml+xml - - - cdbcmsg - application/vnd.contact.cmsg - - - cdf - application/x-cdf - - - cdkey - application/vnd.mediastation.cdkey - - - cdmia - application/cdmi-capability - - - cdmic - application/cdmi-container - - - cdmid - application/cdmi-domain - - - cdmio - application/cdmi-object - - - cdmiq - application/cdmi-queue - - - cdx - chemical/x-cdx - - - cdxml - application/vnd.chemdraw+xml - - - cdy - application/vnd.cinderella - - - cer - application/pkix-cert - - - cgm - image/cgm - - - chat - application/x-chat - - - chm - application/vnd.ms-htmlhelp - - - chrt - application/vnd.kde.kchart - - - cif - chemical/x-cif - - - cii - application/vnd.anser-web-certificate-issue-initiation - - - cil - application/vnd.ms-artgalry - - - cla - application/vnd.claymore - - - class - application/java - - - clkk - application/vnd.crick.clicker.keyboard - - - clkp - application/vnd.crick.clicker.palette - - - clkt - application/vnd.crick.clicker.template - - - clkw - application/vnd.crick.clicker.wordbank - - - clkx - application/vnd.crick.clicker - - - clp - application/x-msclip - - - cmc - application/vnd.cosmocaller - - - cmdf - chemical/x-cmdf - - - cml - chemical/x-cml - - - cmp - application/vnd.yellowriver-custom-menu - - - cmx - image/x-cmx - - - cod - application/vnd.rim.cod - - - com - application/x-msdownload - - - conf - text/plain - - - cpio - application/x-cpio - - - cpp - text/x-c - - - cpt - application/mac-compactpro - - - crd - application/x-mscardfile - - - crl - application/pkix-crl - - - crt - application/x-x509-ca-cert - - - cryptonote - application/vnd.rig.cryptonote - - - csh - application/x-csh - - - csml - chemical/x-csml - - - csp - application/vnd.commonspace - - - css - text/css - - - cst - application/x-director - - - csv - text/csv - - - cu - application/cu-seeme - - - curl - text/vnd.curl - - - cww - application/prs.cww - - - cxt - application/x-director - - - cxx - text/x-c - - - dae - model/vnd.collada+xml - - - daf - application/vnd.mobius.daf - - - dataless - application/vnd.fdsn.seed - - - davmount - application/davmount+xml - - - dcr - application/x-director - - - dcurl - text/vnd.curl.dcurl - - - dd2 - application/vnd.oma.dd2+xml - - - ddd - application/vnd.fujixerox.ddd - - - deb - application/x-debian-package - - - def - text/plain - - - deploy - application/octet-stream - - - der - application/x-x509-ca-cert - - - dfac - application/vnd.dreamfactory - - - dib - image/bmp - - - dic - text/x-c - - - dir - application/x-director - - - dis - application/vnd.mobius.dis - - - dist - application/octet-stream - - - distz - application/octet-stream - - - djv - image/vnd.djvu - - - djvu - image/vnd.djvu - - - dll - application/x-msdownload - - - dmg - application/octet-stream - - - dmp - application/vnd.tcpdump.pcap - - - dms - application/octet-stream - - - dna - application/vnd.dna - - - doc - application/msword - - - docm - application/vnd.ms-word.document.macroenabled.12 - - - docx - application/vnd.openxmlformats-officedocument.wordprocessingml.document - - - dot - application/msword - - - dotm - application/vnd.ms-word.template.macroenabled.12 - - - dotx - application/vnd.openxmlformats-officedocument.wordprocessingml.template - - - dp - application/vnd.osgi.dp - - - dpg - application/vnd.dpgraph - - - dra - audio/vnd.dra - - - dsc - text/prs.lines.tag - - - dssc - application/dssc+der - - - dtb - application/x-dtbook+xml - - - dtd - application/xml-dtd - - - dts - audio/vnd.dts - - - dtshd - audio/vnd.dts.hd - - - dump - application/octet-stream - - - dv - video/x-dv - - - dvb - video/vnd.dvb.file - - - dvi - application/x-dvi - - - dwf - model/vnd.dwf - - - dwg - image/vnd.dwg - - - dxf - image/vnd.dxf - - - dxp - application/vnd.spotfire.dxp - - - dxr - application/x-director - - - ecelp4800 - audio/vnd.nuera.ecelp4800 - - - ecelp7470 - audio/vnd.nuera.ecelp7470 - - - ecelp9600 - audio/vnd.nuera.ecelp9600 - - - ecma - application/ecmascript - - - edm - application/vnd.novadigm.edm - - - edx - application/vnd.novadigm.edx - - - efif - application/vnd.picsel - - - ei6 - application/vnd.pg.osasli - - - elc - application/octet-stream - - - eml - message/rfc822 - - - emma - application/emma+xml - - - eol - audio/vnd.digital-winds - - - eot - application/vnd.ms-fontobject - - - eps - application/postscript - - - epub - application/epub+zip - - - es3 - application/vnd.eszigno3+xml - - - esf - application/vnd.epson.esf - - - et3 - application/vnd.eszigno3+xml - - - etx - text/x-setext - - - exe - application/octet-stream - - - exi - application/exi - - - ext - application/vnd.novadigm.ext - - - ez - application/andrew-inset - - - ez2 - application/vnd.ezpix-album - - - ez3 - application/vnd.ezpix-package - - - f - text/x-fortran - - - f4v - video/x-f4v - - - f77 - text/x-fortran - - - f90 - text/x-fortran - - - fbs - image/vnd.fastbidsheet - - - fcs - application/vnd.isac.fcs - - - fdf - application/vnd.fdf - - - fe_launch - application/vnd.denovo.fcselayout-link - - - fg5 - application/vnd.fujitsu.oasysgp - - - fgd - application/x-director - - - fh - image/x-freehand - - - fh4 - image/x-freehand - - - fh5 - image/x-freehand - - - fh7 - image/x-freehand - - - fhc - image/x-freehand - - - fig - application/x-xfig - - - flac - audio/flac - - - fli - video/x-fli - - - flo - application/vnd.micrografx.flo - - - flv - video/x-flv - - - flw - application/vnd.kde.kivio - - - flx - text/vnd.fmi.flexstor - - - fly - text/vnd.fly - - - fm - application/vnd.framemaker - - - fnc - application/vnd.frogans.fnc - - - for - text/x-fortran - - - fpx - image/vnd.fpx - - - frame - application/vnd.framemaker - - - fsc - application/vnd.fsc.weblaunch - - - fst - image/vnd.fst - - - ftc - application/vnd.fluxtime.clip - - - fti - application/vnd.anser-web-funds-transfer-initiation - - - fvt - video/vnd.fvt - - - fxp - application/vnd.adobe.fxp - - - fxpl - application/vnd.adobe.fxp - - - fzs - application/vnd.fuzzysheet - - - g2w - application/vnd.geoplan - - - g3 - image/g3fax - - - g3w - application/vnd.geospace - - - gac - application/vnd.groove-account - - - gbr - application/rpki-ghostbusters - - - gdl - model/vnd.gdl - - - geo - application/vnd.dynageo - - - gex - application/vnd.geometry-explorer - - - ggb - application/vnd.geogebra.file - - - ggt - application/vnd.geogebra.tool - - - ghf - application/vnd.groove-help - - - gif - image/gif - - - gim - application/vnd.groove-identity-message - - - gmx - application/vnd.gmx - - - gnumeric - application/x-gnumeric - - - gph - application/vnd.flographit - - - gqf - application/vnd.grafeq - - - gqs - application/vnd.grafeq - - - gram - application/srgs - - - gre - application/vnd.geometry-explorer - - - grv - application/vnd.groove-injector - - - grxml - application/srgs+xml - - - gsf - application/x-font-ghostscript - - - gtar - application/x-gtar - - - gtm - application/vnd.groove-tool-message - - - gtw - model/vnd.gtw - - - gv - text/vnd.graphviz - - - gxt - application/vnd.geonext - - - gz - application/x-gzip - - - h - text/x-c - - - h261 - video/h261 - - - h263 - video/h263 - - - h264 - video/h264 - - - hal - application/vnd.hal+xml - - - hbci - application/vnd.hbci - - - hdf - application/x-hdf - - - hh - text/x-c - - - hlp - application/winhlp - - - hpgl - application/vnd.hp-hpgl - - - hpid - application/vnd.hp-hpid - - - hps - application/vnd.hp-hps - - - hqx - application/mac-binhex40 - - - htc - text/x-component - - - htke - application/vnd.kenameaapp - - - htm - text/html - - - html - text/html - - - hvd - application/vnd.yamaha.hv-dic - - - hvp - application/vnd.yamaha.hv-voice - - - hvs - application/vnd.yamaha.hv-script - - - i2g - application/vnd.intergeo - - - icc - application/vnd.iccprofile - - - ice - x-conference/x-cooltalk - - - icm - application/vnd.iccprofile - - - ico - image/x-icon - - - ics - text/calendar - - - ief - image/ief - - - ifb - text/calendar - - - ifm - application/vnd.shana.informed.formdata - - - iges - model/iges - - - igl - application/vnd.igloader - - - igm - application/vnd.insors.igm - - - igs - model/iges - - - igx - application/vnd.micrografx.igx - - - iif - application/vnd.shana.informed.interchange - - - imp - application/vnd.accpac.simply.imp - - - ims - application/vnd.ms-ims - - - in - text/plain - - - ink - application/inkml+xml - - - inkml - application/inkml+xml - - - iota - application/vnd.astraea-software.iota - - - ipfix - application/ipfix - - - ipk - application/vnd.shana.informed.package - - - irm - application/vnd.ibm.rights-management - - - irp - application/vnd.irepository.package+xml - - - iso - application/octet-stream - - - itp - application/vnd.shana.informed.formtemplate - - - ivp - application/vnd.immervision-ivp - - - ivu - application/vnd.immervision-ivu - - - jad - text/vnd.sun.j2me.app-descriptor - - - jam - application/vnd.jam - - - jar - application/java-archive - - - java - text/x-java-source - - - jisp - application/vnd.jisp - - - jlt - application/vnd.hp-jlyt - - - jnlp - application/x-java-jnlp-file - - - joda - application/vnd.joost.joda-archive - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - jpgm - video/jpm - - - jpgv - video/jpeg - - - jpm - video/jpm - - - js - application/javascript - - - jsf - text/plain - - - json - application/json - - - jspf - text/plain - - - kar - audio/midi - - - karbon - application/vnd.kde.karbon - - - kfo - application/vnd.kde.kformula - - - kia - application/vnd.kidspiration - - - kml - application/vnd.google-earth.kml+xml - - - kmz - application/vnd.google-earth.kmz - - - kne - application/vnd.kinar - - - knp - application/vnd.kinar - - - kon - application/vnd.kde.kontour - - - kpr - application/vnd.kde.kpresenter - - - kpt - application/vnd.kde.kpresenter - - - ksp - application/vnd.kde.kspread - - - ktr - application/vnd.kahootz - - - ktx - image/ktx - - - ktz - application/vnd.kahootz - - - kwd - application/vnd.kde.kword - - - kwt - application/vnd.kde.kword - - - lasxml - application/vnd.las.las+xml - - - latex - application/x-latex - - - lbd - application/vnd.llamagraphics.life-balance.desktop - - - lbe - application/vnd.llamagraphics.life-balance.exchange+xml - - - les - application/vnd.hhe.lesson-player - - - lha - application/octet-stream - - - link66 - application/vnd.route66.link66+xml - - - list - text/plain - - - list3820 - application/vnd.ibm.modcap - - - listafp - application/vnd.ibm.modcap - - - log - text/plain - - - lostxml - application/lost+xml - - - lrf - application/octet-stream - - - lrm - application/vnd.ms-lrm - - - ltf - application/vnd.frogans.ltf - - - lvp - audio/vnd.lucent.voice - - - lwp - application/vnd.lotus-wordpro - - - lzh - application/octet-stream - - - m13 - application/x-msmediaview - - - m14 - application/x-msmediaview - - - m1v - video/mpeg - - - m21 - application/mp21 - - - m2a - audio/mpeg - - - m2v - video/mpeg - - - m3a - audio/mpeg - - - m3u - audio/x-mpegurl - - - m3u8 - application/vnd.apple.mpegurl - - - m4a - audio/mp4 - - - m4b - audio/mp4 - - - m4r - audio/mp4 - - - m4u - video/vnd.mpegurl - - - m4v - video/mp4 - - - ma - application/mathematica - - - mac - image/x-macpaint - - - mads - application/mads+xml - - - mag - application/vnd.ecowin.chart - - - maker - application/vnd.framemaker - - - man - text/troff - - - mathml - application/mathml+xml - - - mb - application/mathematica - - - mbk - application/vnd.mobius.mbk - - - mbox - application/mbox - - - mc1 - application/vnd.medcalcdata - - - mcd - application/vnd.mcd - - - mcurl - text/vnd.curl.mcurl - - - mdb - application/x-msaccess - - - mdi - image/vnd.ms-modi - - - me - text/troff - - - mesh - model/mesh - - - meta4 - application/metalink4+xml - - - mets - application/mets+xml - - - mfm - application/vnd.mfmp - - - mft - application/rpki-manifest - - - mgp - application/vnd.osgeo.mapguide.package - - - mgz - application/vnd.proteus.magazine - - - mid - audio/midi - - - midi - audio/midi - - - mif - application/x-mif - - - mime - message/rfc822 - - - mj2 - video/mj2 - - - mjp2 - video/mj2 - - - mlp - application/vnd.dolby.mlp - - - mmd - application/vnd.chipnuts.karaoke-mmd - - - mmf - application/vnd.smaf - - - mmr - image/vnd.fujixerox.edmics-mmr - - - mny - application/x-msmoney - - - mobi - application/x-mobipocket-ebook - - - mods - application/mods+xml - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/mpeg - - - mp2 - audio/mpeg - - - mp21 - application/mp21 - - - mp2a - audio/mpeg - - - mp3 - audio/mpeg - - - mp4 - video/mp4 - - - mp4a - audio/mp4 - - - mp4s - application/mp4 - - - mp4v - video/mp4 - - - mpa - audio/mpeg - - - mpc - application/vnd.mophun.certificate - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpg4 - video/mp4 - - - mpga - audio/mpeg - - - mpkg - application/vnd.apple.installer+xml - - - mpm - application/vnd.blueice.multipass - - - mpn - application/vnd.mophun.application - - - mpp - application/vnd.ms-project - - - mpt - application/vnd.ms-project - - - mpv2 - video/mpeg2 - - - mpy - application/vnd.ibm.minipay - - - mqy - application/vnd.mobius.mqy - - - mrc - application/marc - - - mrcx - application/marcxml+xml - - - ms - text/troff - - - mscml - application/mediaservercontrol+xml - - - mseed - application/vnd.fdsn.mseed - - - mseq - application/vnd.mseq - - - msf - application/vnd.epson.msf - - - msh - model/mesh - - - msi - application/x-msdownload - - - msl - application/vnd.mobius.msl - - - msty - application/vnd.muvee.style - - - mts - model/vnd.mts - - - mus - application/vnd.musician - - - musicxml - application/vnd.recordare.musicxml+xml - - - mvb - application/x-msmediaview - - - mwf - application/vnd.mfer - - - mxf - application/mxf - - - mxl - application/vnd.recordare.musicxml - - - mxml - application/xv+xml - - - mxs - application/vnd.triscape.mxs - - - mxu - video/vnd.mpegurl - - - n-gage - application/vnd.nokia.n-gage.symbian.install - - - n3 - text/n3 - - - nb - application/mathematica - - - nbp - application/vnd.wolfram.player - - - nc - application/x-netcdf - - - ncx - application/x-dtbncx+xml - - - ngdat - application/vnd.nokia.n-gage.data - - - nlu - application/vnd.neurolanguage.nlu - - - nml - application/vnd.enliven - - - nnd - application/vnd.noblenet-directory - - - nns - application/vnd.noblenet-sealer - - - nnw - application/vnd.noblenet-web - - - npx - image/vnd.net-fpx - - - nsf - application/vnd.lotus-notes - - - oa2 - application/vnd.fujitsu.oasys2 - - - oa3 - application/vnd.fujitsu.oasys3 - - - oas - application/vnd.fujitsu.oasys - - - obd - application/x-msbinder - - - oda - application/oda - - - - odb - application/vnd.oasis.opendocument.database - - - - odc - application/vnd.oasis.opendocument.chart - - - - odf - application/vnd.oasis.opendocument.formula - - - odft - application/vnd.oasis.opendocument.formula-template - - - - odg - application/vnd.oasis.opendocument.graphics - - - - odi - application/vnd.oasis.opendocument.image - - - - odm - application/vnd.oasis.opendocument.text-master - - - - odp - application/vnd.oasis.opendocument.presentation - - - - ods - application/vnd.oasis.opendocument.spreadsheet - - - - odt - application/vnd.oasis.opendocument.text - - - oga - audio/ogg - - - ogg - audio/ogg - - - ogv - video/ogg - - - - ogx - application/ogg - - - onepkg - application/onenote - - - onetmp - application/onenote - - - onetoc - application/onenote - - - onetoc2 - application/onenote - - - opf - application/oebps-package+xml - - - oprc - application/vnd.palm - - - org - application/vnd.lotus-organizer - - - osf - application/vnd.yamaha.openscoreformat - - - osfpvg - application/vnd.yamaha.openscoreformat.osfpvg+xml - - - otc - application/vnd.oasis.opendocument.chart-template - - - otf - application/x-font-otf - - - - otg - application/vnd.oasis.opendocument.graphics-template - - - - oth - application/vnd.oasis.opendocument.text-web - - - oti - application/vnd.oasis.opendocument.image-template - - - - otp - application/vnd.oasis.opendocument.presentation-template - - - - ots - application/vnd.oasis.opendocument.spreadsheet-template - - - - ott - application/vnd.oasis.opendocument.text-template - - - oxps - application/oxps - - - oxt - application/vnd.openofficeorg.extension - - - p - text/x-pascal - - - p10 - application/pkcs10 - - - p12 - application/x-pkcs12 - - - p7b - application/x-pkcs7-certificates - - - p7c - application/pkcs7-mime - - - p7m - application/pkcs7-mime - - - p7r - application/x-pkcs7-certreqresp - - - p7s - application/pkcs7-signature - - - p8 - application/pkcs8 - - - pas - text/x-pascal - - - paw - application/vnd.pawaafile - - - pbd - application/vnd.powerbuilder6 - - - pbm - image/x-portable-bitmap - - - pcap - application/vnd.tcpdump.pcap - - - pcf - application/x-font-pcf - - - pcl - application/vnd.hp-pcl - - - pclxl - application/vnd.hp-pclxl - - - pct - image/pict - - - pcurl - application/vnd.curl.pcurl - - - pcx - image/x-pcx - - - pdb - application/vnd.palm - - - pdf - application/pdf - - - pfa - application/x-font-type1 - - - pfb - application/x-font-type1 - - - pfm - application/x-font-type1 - - - pfr - application/font-tdpfr - - - pfx - application/x-pkcs12 - - - pgm - image/x-portable-graymap - - - pgn - application/x-chess-pgn - - - pgp - application/pgp-encrypted - - - pic - image/pict - - - pict - image/pict - - - pkg - application/octet-stream - - - pki - application/pkixcmp - - - pkipath - application/pkix-pkipath - - - plb - application/vnd.3gpp.pic-bw-large - - - plc - application/vnd.mobius.plc - - - plf - application/vnd.pocketlearn - - - pls - audio/x-scpls - - - pml - application/vnd.ctc-posml - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - portpkg - application/vnd.macports.portpkg - - - pot - application/vnd.ms-powerpoint - - - potm - application/vnd.ms-powerpoint.template.macroenabled.12 - - - potx - application/vnd.openxmlformats-officedocument.presentationml.template - - - ppam - application/vnd.ms-powerpoint.addin.macroenabled.12 - - - ppd - application/vnd.cups-ppd - - - ppm - image/x-portable-pixmap - - - pps - application/vnd.ms-powerpoint - - - ppsm - application/vnd.ms-powerpoint.slideshow.macroenabled.12 - - - ppsx - application/vnd.openxmlformats-officedocument.presentationml.slideshow - - - ppt - application/vnd.ms-powerpoint - - - pptm - application/vnd.ms-powerpoint.presentation.macroenabled.12 - - - pptx - application/vnd.openxmlformats-officedocument.presentationml.presentation - - - pqa - application/vnd.palm - - - prc - application/x-mobipocket-ebook - - - pre - application/vnd.lotus-freelance - - - prf - application/pics-rules - - - ps - application/postscript - - - psb - application/vnd.3gpp.pic-bw-small - - - psd - image/vnd.adobe.photoshop - - - psf - application/x-font-linux-psf - - - pskcxml - application/pskc+xml - - - ptid - application/vnd.pvi.ptid1 - - - pub - application/x-mspublisher - - - pvb - application/vnd.3gpp.pic-bw-var - - - pwn - application/vnd.3m.post-it-notes - - - pya - audio/vnd.ms-playready.media.pya - - - pyv - video/vnd.ms-playready.media.pyv - - - qam - application/vnd.epson.quickanime - - - qbo - application/vnd.intu.qbo - - - qfx - application/vnd.intu.qfx - - - qps - application/vnd.publishare-delta-tree - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - qwd - application/vnd.quark.quarkxpress - - - qwt - application/vnd.quark.quarkxpress - - - qxb - application/vnd.quark.quarkxpress - - - qxd - application/vnd.quark.quarkxpress - - - qxl - application/vnd.quark.quarkxpress - - - qxt - application/vnd.quark.quarkxpress - - - ra - audio/x-pn-realaudio - - - ram - audio/x-pn-realaudio - - - rar - application/x-rar-compressed - - - ras - image/x-cmu-raster - - - rcprofile - application/vnd.ipunplugged.rcprofile - - - rdf - application/rdf+xml - - - rdz - application/vnd.data-vision.rdz - - - rep - application/vnd.businessobjects - - - res - application/x-dtbresource+xml - - - rgb - image/x-rgb - - - rif - application/reginfo+xml - - - rip - audio/vnd.rip - - - rl - application/resource-lists+xml - - - rlc - image/vnd.fujixerox.edmics-rlc - - - rld - application/resource-lists-diff+xml - - - rm - application/vnd.rn-realmedia - - - rmi - audio/midi - - - rmp - audio/x-pn-realaudio-plugin - - - rms - application/vnd.jcp.javame.midlet-rms - - - rnc - application/relax-ng-compact-syntax - - - roa - application/rpki-roa - - - roff - text/troff - - - rp9 - application/vnd.cloanto.rp9 - - - rpss - application/vnd.nokia.radio-presets - - - rpst - application/vnd.nokia.radio-preset - - - rq - application/sparql-query - - - rs - application/rls-services+xml - - - rsd - application/rsd+xml - - - rss - application/rss+xml - - - rtf - application/rtf - - - rtx - text/richtext - - - s - text/x-asm - - - saf - application/vnd.yamaha.smaf-audio - - - sbml - application/sbml+xml - - - sc - application/vnd.ibm.secure-container - - - scd - application/x-msschedule - - - scm - application/vnd.lotus-screencam - - - scq - application/scvp-cv-request - - - scs - application/scvp-cv-response - - - scurl - text/vnd.curl.scurl - - - sda - application/vnd.stardivision.draw - - - sdc - application/vnd.stardivision.calc - - - sdd - application/vnd.stardivision.impress - - - sdkd - application/vnd.solent.sdkm+xml - - - sdkm - application/vnd.solent.sdkm+xml - - - sdp - application/sdp - - - sdw - application/vnd.stardivision.writer - - - see - application/vnd.seemail - - - seed - application/vnd.fdsn.seed - - - sema - application/vnd.sema - - - semd - application/vnd.semd - - - semf - application/vnd.semf - - - ser - application/java-serialized-object - - - setpay - application/set-payment-initiation - - - setreg - application/set-registration-initiation - - - sfd-hdstx - application/vnd.hydrostatix.sof-data - - - sfs - application/vnd.spotfire.sfs - - - sgl - application/vnd.stardivision.writer-global - - - sgm - text/sgml - - - sgml - text/sgml - - - sh - application/x-sh - - - shar - application/x-shar - - - shf - application/shf+xml - - - - sig - application/pgp-signature - - - silo - model/mesh - - - sis - application/vnd.symbian.install - - - sisx - application/vnd.symbian.install - - - sit - application/x-stuffit - - - sitx - application/x-stuffitx - - - skd - application/vnd.koan - - - skm - application/vnd.koan - - - skp - application/vnd.koan - - - skt - application/vnd.koan - - - sldm - application/vnd.ms-powerpoint.slide.macroenabled.12 - - - sldx - application/vnd.openxmlformats-officedocument.presentationml.slide - - - slt - application/vnd.epson.salt - - - sm - application/vnd.stepmania.stepchart - - - smf - application/vnd.stardivision.math - - - smi - application/smil+xml - - - smil - application/smil+xml - - - smzip - application/vnd.stepmania.package - - - snd - audio/basic - - - snf - application/x-font-snf - - - so - application/octet-stream - - - spc - application/x-pkcs7-certificates - - - spf - application/vnd.yamaha.smaf-phrase - - - spl - application/x-futuresplash - - - spot - text/vnd.in3d.spot - - - spp - application/scvp-vp-response - - - spq - application/scvp-vp-request - - - spx - audio/ogg - - - src - application/x-wais-source - - - sru - application/sru+xml - - - srx - application/sparql-results+xml - - - sse - application/vnd.kodak-descriptor - - - ssf - application/vnd.epson.ssf - - - ssml - application/ssml+xml - - - st - application/vnd.sailingtracker.track - - - stc - application/vnd.sun.xml.calc.template - - - std - application/vnd.sun.xml.draw.template - - - stf - application/vnd.wt.stf - - - sti - application/vnd.sun.xml.impress.template - - - stk - application/hyperstudio - - - stl - application/vnd.ms-pki.stl - - - str - application/vnd.pg.format - - - stw - application/vnd.sun.xml.writer.template - - - sub - text/vnd.dvb.subtitle - - - sus - application/vnd.sus-calendar - - - susp - application/vnd.sus-calendar - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svc - application/vnd.dvb.service - - - svd - application/vnd.svd - - - svg - image/svg+xml - - - svgz - image/svg+xml - - - swa - application/x-director - - - swf - application/x-shockwave-flash - - - swi - application/vnd.aristanetworks.swi - - - sxc - application/vnd.sun.xml.calc - - - sxd - application/vnd.sun.xml.draw - - - sxg - application/vnd.sun.xml.writer.global - - - sxi - application/vnd.sun.xml.impress - - - sxm - application/vnd.sun.xml.math - - - sxw - application/vnd.sun.xml.writer - - - t - text/troff - - - taglet - application/vnd.mynfc - - - tao - application/vnd.tao.intent-module-archive - - - tar - application/x-tar - - - tcap - application/vnd.3gpp2.tcap - - - tcl - application/x-tcl - - - teacher - application/vnd.smart.teacher - - - tei - application/tei+xml - - - teicorpus - application/tei+xml - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - text - text/plain - - - tfi - application/thraud+xml - - - tfm - application/x-tex-tfm - - - thmx - application/vnd.ms-officetheme - - - tif - image/tiff - - - tiff - image/tiff - - - tmo - application/vnd.tmobile-livetv - - - torrent - application/x-bittorrent - - - tpl - application/vnd.groove-tool-template - - - tpt - application/vnd.trid.tpt - - - tr - text/troff - - - tra - application/vnd.trueapp - - - trm - application/x-msterminal - - - tsd - application/timestamped-data - - - tsv - text/tab-separated-values - - - ttc - application/x-font-ttf - - - ttf - application/x-font-ttf - - - ttl - text/turtle - - - twd - application/vnd.simtech-mindmapper - - - twds - application/vnd.simtech-mindmapper - - - txd - application/vnd.genomatix.tuxedo - - - txf - application/vnd.mobius.txf - - - txt - text/plain - - - u32 - application/x-authorware-bin - - - udeb - application/x-debian-package - - - ufd - application/vnd.ufdl - - - ufdl - application/vnd.ufdl - - - ulw - audio/basic - - - umj - application/vnd.umajin - - - unityweb - application/vnd.unity - - - uoml - application/vnd.uoml+xml - - - uri - text/uri-list - - - uris - text/uri-list - - - urls - text/uri-list - - - ustar - application/x-ustar - - - utz - application/vnd.uiq.theme - - - uu - text/x-uuencode - - - uva - audio/vnd.dece.audio - - - uvd - application/vnd.dece.data - - - uvf - application/vnd.dece.data - - - uvg - image/vnd.dece.graphic - - - uvh - video/vnd.dece.hd - - - uvi - image/vnd.dece.graphic - - - uvm - video/vnd.dece.mobile - - - uvp - video/vnd.dece.pd - - - uvs - video/vnd.dece.sd - - - uvt - application/vnd.dece.ttml+xml - - - uvu - video/vnd.uvvu.mp4 - - - uvv - video/vnd.dece.video - - - uvva - audio/vnd.dece.audio - - - uvvd - application/vnd.dece.data - - - uvvf - application/vnd.dece.data - - - uvvg - image/vnd.dece.graphic - - - uvvh - video/vnd.dece.hd - - - uvvi - image/vnd.dece.graphic - - - uvvm - video/vnd.dece.mobile - - - uvvp - video/vnd.dece.pd - - - uvvs - video/vnd.dece.sd - - - uvvt - application/vnd.dece.ttml+xml - - - uvvu - video/vnd.uvvu.mp4 - - - uvvv - video/vnd.dece.video - - - uvvx - application/vnd.dece.unspecified - - - uvvz - application/vnd.dece.zip - - - uvx - application/vnd.dece.unspecified - - - uvz - application/vnd.dece.zip - - - vcard - text/vcard - - - vcd - application/x-cdlink - - - vcf - text/x-vcard - - - vcg - application/vnd.groove-vcard - - - vcs - text/x-vcalendar - - - vcx - application/vnd.vcx - - - vis - application/vnd.visionary - - - viv - video/vnd.vivo - - - vor - application/vnd.stardivision.writer - - - vox - application/x-authorware-bin - - - vrml - model/vrml - - - vsd - application/vnd.visio - - - vsf - application/vnd.vsf - - - vss - application/vnd.visio - - - vst - application/vnd.visio - - - vsw - application/vnd.visio - - - vtu - model/vnd.vtu - - - vxml - application/voicexml+xml - - - w3d - application/x-director - - - wad - application/x-doom - - - wav - audio/x-wav - - - wax - audio/x-ms-wax - - - - wbmp - image/vnd.wap.wbmp - - - wbs - application/vnd.criticaltools.wbs+xml - - - wbxml - application/vnd.wap.wbxml - - - wcm - application/vnd.ms-works - - - wdb - application/vnd.ms-works - - - weba - audio/webm - - - webm - video/webm - - - webp - image/webp - - - wg - application/vnd.pmi.widget - - - wgt - application/widget - - - wks - application/vnd.ms-works - - - wm - video/x-ms-wm - - - wma - audio/x-ms-wma - - - wmd - application/x-ms-wmd - - - wmf - application/x-msmetafile - - - - wml - text/vnd.wap.wml - - - - wmlc - application/vnd.wap.wmlc - - - - wmls - text/vnd.wap.wmlscript - - - - wmlsc - application/vnd.wap.wmlscriptc - - - wmv - video/x-ms-wmv - - - wmx - video/x-ms-wmx - - - wmz - application/x-ms-wmz - - - woff - application/x-font-woff - - - wpd - application/vnd.wordperfect - - - wpl - application/vnd.ms-wpl - - - wps - application/vnd.ms-works - - - wqd - application/vnd.wqd - - - wri - application/x-mswrite - - - wrl - model/vrml - - - wsdl - application/wsdl+xml - - - wspolicy - application/wspolicy+xml - - - wtb - application/vnd.webturbo - - - wvx - video/x-ms-wvx - - - x32 - application/x-authorware-bin - - - x3d - application/vnd.hzn-3d-crossword - - - xap - application/x-silverlight-app - - - xar - application/vnd.xara - - - xbap - application/x-ms-xbap - - - xbd - application/vnd.fujixerox.docuworks.binder - - - xbm - image/x-xbitmap - - - xdf - application/xcap-diff+xml - - - xdm - application/vnd.syncml.dm+xml - - - xdp - application/vnd.adobe.xdp+xml - - - xdssc - application/dssc+xml - - - xdw - application/vnd.fujixerox.docuworks - - - xenc - application/xenc+xml - - - xer - application/patch-ops-error+xml - - - xfdf - application/vnd.adobe.xfdf - - - xfdl - application/vnd.xfdl - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xhvml - application/xv+xml - - - xif - image/vnd.xiff - - - xla - application/vnd.ms-excel - - - xlam - application/vnd.ms-excel.addin.macroenabled.12 - - - xlc - application/vnd.ms-excel - - - xlm - application/vnd.ms-excel - - - xls - application/vnd.ms-excel - - - xlsb - application/vnd.ms-excel.sheet.binary.macroenabled.12 - - - xlsm - application/vnd.ms-excel.sheet.macroenabled.12 - - - xlsx - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - - - xlt - application/vnd.ms-excel - - - xltm - application/vnd.ms-excel.template.macroenabled.12 - - - xltx - application/vnd.openxmlformats-officedocument.spreadsheetml.template - - - xlw - application/vnd.ms-excel - - - xml - application/xml - - - xo - application/vnd.olpc-sugar - - - xop - application/xop+xml - - - xpi - application/x-xpinstall - - - xpm - image/x-xpixmap - - - xpr - application/vnd.is-xpr - - - xps - application/vnd.ms-xpsdocument - - - xpw - application/vnd.intercon.formnet - - - xpx - application/vnd.intercon.formnet - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xsm - application/vnd.syncml+xml - - - xspf - application/xspf+xml - - - xul - application/vnd.mozilla.xul+xml - - - xvm - application/xv+xml - - - xvml - application/xv+xml - - - xwd - image/x-xwindowdump - - - xyz - chemical/x-xyz - - - yang - application/yang - - - yin - application/yin+xml - - - z - application/x-compress - - - Z - application/x-compress - - - zaz - application/vnd.zzazz.deck+xml - - - zip - application/zip - - - zir - application/vnd.zul - - - zirz - application/vnd.zul - - - zmm - application/vnd.handheld-entertainment+xml - - - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - diff --git a/wisdom_manager/wisdom_manager_service/target/tomcat/logs/access_log.2019-04-28 b/wisdom_manager/wisdom_manager_service/target/tomcat/logs/access_log.2019-04-28 deleted file mode 100644 index 9300a7d..0000000 --- a/wisdom_manager/wisdom_manager_service/target/tomcat/logs/access_log.2019-04-28 +++ /dev/null @@ -1,2 +0,0 @@ -0:0:0:0:0:0:0:1 - - [28/Apr/2019:15:25:32 +0800] "GET / HTTP/1.1" 200 57 http-bio-8080-exec-1 1080 -0:0:0:0:0:0:0:1 - - [28/Apr/2019:15:25:32 +0800] "GET /favicon.ico HTTP/1.1" 404 973 http-bio-8080-exec-3 3 diff --git a/wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.class b/wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.class deleted file mode 100644 index 4554b43..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.class and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java b/wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java deleted file mode 100644 index c5e7c67..0000000 --- a/wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Generated by the Jasper component of Apache Tomcat - * Version: Apache Tomcat/7.0.47 - * Generated at: 2019-04-28 07:25:31 UTC - * Note: The last modified time of this file was set to - * the last modified time of the source file after - * generation to assist with modification tracking. - */ -package org.apache.jsp; - -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.jsp.*; - -public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase - implements org.apache.jasper.runtime.JspSourceDependent { - - private static final javax.servlet.jsp.JspFactory _jspxFactory = - javax.servlet.jsp.JspFactory.getDefaultFactory(); - - private static java.util.Map _jspx_dependants; - - private javax.el.ExpressionFactory _el_expressionfactory; - private org.apache.tomcat.InstanceManager _jsp_instancemanager; - - public java.util.Map getDependants() { - return _jspx_dependants; - } - - public void _jspInit() { - _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory(); - _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig()); - } - - public void _jspDestroy() { - } - - public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response) - throws java.io.IOException, javax.servlet.ServletException { - - final javax.servlet.jsp.PageContext pageContext; - javax.servlet.http.HttpSession session = null; - final javax.servlet.ServletContext application; - final javax.servlet.ServletConfig config; - javax.servlet.jsp.JspWriter out = null; - final java.lang.Object page = this; - javax.servlet.jsp.JspWriter _jspx_out = null; - javax.servlet.jsp.PageContext _jspx_page_context = null; - - - try { - response.setContentType("text/html"); - pageContext = _jspxFactory.getPageContext(this, request, response, - null, true, 8192, true); - _jspx_page_context = pageContext; - application = pageContext.getServletContext(); - config = pageContext.getServletConfig(); - session = pageContext.getSession(); - out = pageContext.getOut(); - _jspx_out = out; - - out.write("\r\n"); - out.write("\r\n"); - out.write("

Hello World!

\r\n"); - out.write("\r\n"); - out.write("\r\n"); - } catch (java.lang.Throwable t) { - if (!(t instanceof javax.servlet.jsp.SkipPageException)){ - out = _jspx_out; - if (out != null && out.getBufferSize() != 0) - try { out.clearBuffer(); } catch (java.io.IOException e) {} - if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); - else throw new ServletException(t); - } - } finally { - _jspxFactory.releasePageContext(_jspx_page_context); - } - } -} diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service.war b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service.war deleted file mode 100644 index 1fd5ae3..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service.war and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/mybatis/SqlMapConfig.xml b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/mybatis/SqlMapConfig.xml deleted file mode 100644 index 952806c..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/mybatis/SqlMapConfig.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/properties/db.properties b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/properties/db.properties deleted file mode 100644 index bfe3093..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/properties/db.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://47.103.14.73:3306/team_model?characterEncoding=utf-8 -jdbc.username=root -jdbc.password=ndl.04551 \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/properties/log4j.properties b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/properties/log4j.properties deleted file mode 100644 index 3802802..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/properties/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=WARN,A1 -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c]-[%p] %m%n \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-dao.xml b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-dao.xml deleted file mode 100644 index 7010619..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-dao.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-service.xml b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-service.xml deleted file mode 100644 index b259f78..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-service.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-transaction.xml b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-transaction.xml deleted file mode 100644 index fe97876..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-transaction.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/aspectjweaver-1.9.2.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/aspectjweaver-1.9.2.jar deleted file mode 100644 index ea0d8df..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/aspectjweaver-1.9.2.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/c3p0-0.9.1.1.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/c3p0-0.9.1.1.jar deleted file mode 100644 index 8d283e4..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/c3p0-0.9.1.1.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-codec-1.6.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-codec-1.6.jar deleted file mode 100644 index ee1bc49..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-codec-1.6.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-io-1.3.2.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-io-1.3.2.jar deleted file mode 100644 index 865c9e4..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-io-1.3.2.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-lang3-3.3.2.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-lang3-3.3.2.jar deleted file mode 100644 index 2ce08ae..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-lang3-3.3.2.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-logging-1.1.3.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-logging-1.1.3.jar deleted file mode 100644 index ab51254..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-logging-1.1.3.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-net-3.3.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-net-3.3.jar deleted file mode 100644 index f4f19a9..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/commons-net-3.3.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/core-3.1.0.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/core-3.1.0.jar deleted file mode 100644 index 4af3020..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/core-3.1.0.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/druid-1.0.9.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/druid-1.0.9.jar deleted file mode 100644 index 517dbc1..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/druid-1.0.9.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/dubbo-2.5.3.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/dubbo-2.5.3.jar deleted file mode 100644 index a77a7f3..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/dubbo-2.5.3.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/fastjson-1.2.57.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/fastjson-1.2.57.jar deleted file mode 100644 index 6171193..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/fastjson-1.2.57.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/httpclient-4.3.5.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/httpclient-4.3.5.jar deleted file mode 100644 index 1db1225..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/httpclient-4.3.5.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/httpcore-4.3.2.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/httpcore-4.3.2.jar deleted file mode 100644 index 813ec23..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/httpcore-4.3.2.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/javassist-3.15.0-GA.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/javassist-3.15.0-GA.jar deleted file mode 100644 index 5af8eae..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/javassist-3.15.0-GA.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/jline-0.9.94.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/jline-0.9.94.jar deleted file mode 100644 index dede372..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/jline-0.9.94.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/joda-time-2.5.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/joda-time-2.5.jar deleted file mode 100644 index 4fe151d..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/joda-time-2.5.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/jsqlparser-0.9.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/jsqlparser-0.9.jar deleted file mode 100644 index add444f..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/jsqlparser-0.9.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/log4j-1.2.16.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/log4j-1.2.16.jar deleted file mode 100644 index 5429a90..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/log4j-1.2.16.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-3.4.6.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-3.4.6.jar deleted file mode 100644 index ae6aae8..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-3.4.6.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-paginator-1.2.15.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-paginator-1.2.15.jar deleted file mode 100644 index 8d4c50b..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-paginator-1.2.15.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-spring-2.0.1.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-spring-2.0.1.jar deleted file mode 100644 index 9b7c860..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mybatis-spring-2.0.1.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mysql-connector-java-5.1.32.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mysql-connector-java-5.1.32.jar deleted file mode 100644 index f82dd98..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/mysql-connector-java-5.1.32.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/netty-3.7.0.Final.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/netty-3.7.0.Final.jar deleted file mode 100644 index eef1aba..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/netty-3.7.0.Final.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/pagehelper-3.4.2-fix.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/pagehelper-3.4.2-fix.jar deleted file mode 100644 index fe886fe..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/pagehelper-3.4.2-fix.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/quartz-2.2.2.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/quartz-2.2.2.jar deleted file mode 100644 index bfff897..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/quartz-2.2.2.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/slf4j-api-1.6.1.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/slf4j-api-1.6.1.jar deleted file mode 100644 index f1f4fdd..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/slf4j-api-1.6.1.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/slf4j-log4j12-1.6.4.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/slf4j-log4j12-1.6.4.jar deleted file mode 100644 index 1517fbd..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/slf4j-log4j12-1.6.4.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar deleted file mode 100644 index 3e4c0eb..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-aspects-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-aspects-5.1.5.RELEASE.jar deleted file mode 100644 index 13bde27..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-aspects-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar deleted file mode 100644 index f793dc8..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar deleted file mode 100644 index 8253c22..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-context-support-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-context-support-5.1.5.RELEASE.jar deleted file mode 100644 index 1358db2..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-context-support-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar deleted file mode 100644 index 6f5056a..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar deleted file mode 100644 index 999540f..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar deleted file mode 100644 index df14814..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jdbc-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jdbc-5.1.5.RELEASE.jar deleted file mode 100644 index 3e42fef..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jdbc-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jms-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jms-5.1.5.RELEASE.jar deleted file mode 100644 index 17cc4b4..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-jms-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-messaging-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-messaging-5.1.5.RELEASE.jar deleted file mode 100644 index f206bbc..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-messaging-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-tx-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-tx-5.1.5.RELEASE.jar deleted file mode 100644 index 6ab7d77..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-tx-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar deleted file mode 100644 index b66ff17..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar deleted file mode 100644 index e760ae1..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar deleted file mode 100644 index c969ee6..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_dao-1.0-SNAPSHOT.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_dao-1.0-SNAPSHOT.jar deleted file mode 100644 index 3c7d472..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_dao-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar deleted file mode 100644 index e864c41..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar deleted file mode 100644 index c652f61..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/zkclient-0.1.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/zkclient-0.1.jar deleted file mode 100644 index aebcc34..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/zkclient-0.1.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/zookeeper-3.4.7.jar b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/zookeeper-3.4.7.jar deleted file mode 100644 index dfcd074..0000000 Binary files a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/zookeeper-3.4.7.jar and /dev/null differ diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/web.xml b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/web.xml deleted file mode 100644 index 9f88c1f..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - Archetype Created Web Application - diff --git a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/index.jsp b/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/index.jsp deleted file mode 100644 index c38169b..0000000 --- a/wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello World!

- - diff --git a/wisdom_web/pom.xml b/wisdom_web/pom.xml index 1c86420..90939ee 100644 --- a/wisdom_web/pom.xml +++ b/wisdom_web/pom.xml @@ -12,6 +12,15 @@ wisdom_web + + com.squareup.okhttp3 + okhttp + + + + joda-time + joda-time + com.github.pagehelper @@ -88,6 +97,10 @@ + + org.javassist + javassist + org.apache.zookeeper zookeeper diff --git a/wisdom_web/src/main/java/com/smart/Converter/StringToDate.java b/wisdom_web/src/main/java/com/smart/Converter/StringToDate.java new file mode 100644 index 0000000..b0170ae --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/Converter/StringToDate.java @@ -0,0 +1,35 @@ +package com.smart.Converter; + +import com.smart.utils.DateUtils; +import org.joda.time.DateTime; +import org.joda.time.format.ISODateTimeFormat; +import org.junit.Test; +import org.springframework.core.convert.converter.Converter; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.SortedMap; + + +public class StringToDate implements Converter { + + @Override + public DateTime convert(String source) { + if (source.equals("")||source == null) + return null; + //获取第一个空格的位置 + return DateUtils.stringToDatetime(source); + } + + + @Test + public void fun(){ + String source = "2019-10-10 00:00:00"; + DateTime dateTime = new DateTime(source); + String s = dateTime.toString("yyyy-MM-dd HH:mm:ss"); + System.out.println(s); + + } + + +} diff --git a/wisdom_web/src/main/java/com/smart/CourseAdvice.java b/wisdom_web/src/main/java/com/smart/CourseAdvice.java new file mode 100644 index 0000000..a05fc96 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/CourseAdvice.java @@ -0,0 +1,27 @@ +package com.smart; + +import com.smart.pojo.WisdomResult; +import org.apache.commons.lang3.ArrayUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.Signature; +import org.aspectj.lang.reflect.MethodSignature; + +public class CourseAdvice { + + public WisdomResult checkParamAndResult(ProceedingJoinPoint joinPoint){ + //获取所有参数以 + Object[] args = joinPoint.getArgs(); + Signature signature = joinPoint.getSignature(); + MethodSignature methodSignature = (MethodSignature) signature; + //通过这获取到方法的所有参数名称的字符串数组 + String[] parameterNames = methodSignature.getParameterNames(); + + try { + //通过你需要获取的参数名称的下标获取到对应的值 + ArrayUtils.indexOf(parameterNames,""); + }catch (Exception e){ + e.printStackTrace(); + } + return new WisdomResult(); + } +} diff --git a/wisdom_web/src/main/java/com/smart/controller/CourseCriticismController.java b/wisdom_web/src/main/java/com/smart/controller/CourseCriticismController.java new file mode 100644 index 0000000..479e51e --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/CourseCriticismController.java @@ -0,0 +1,52 @@ +package com.smart.controller; + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.TbAnswerQuestion; +import com.smart.pojo.TeacherInfo; +import com.smart.pojo.WisdomResult; +import com.smart.service.CourseCriticismService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; + +/** + * 课程答疑 + * 留言 + */ + +@RequestMapping("/courseCriticism") +public class CourseCriticismController { + + @Autowired + private CourseCriticismService courseCriticismService; + + /** + * 添加评论在课程中 + */ + public WisdomResult addCriticismToCourse(TbAnswerQuestion tbAnswerQuestion,HttpServletRequest request){ + //先判断是老师还是学生 + Integer status = (Integer) request.getSession().getAttribute("status"); + StudentInfo studentInfo ; + TeacherInfo teacherInfo; + String id = null; + String fromName = null; + if (status == 1) { + studentInfo = (StudentInfo) request.getSession().getAttribute("student"); + id = studentInfo.getId(); + fromName = studentInfo.getName(); + } else if (status == 2){ + teacherInfo = (TeacherInfo) request.getSession().getAttribute("teacher"); + id = teacherInfo.getId(); + } + tbAnswerQuestion.setFromId(id); + courseCriticismService.addCriticism(tbAnswerQuestion); + //获取学生或老师的信息 + return new WisdomResult(); + } + + public WisdomResult getCriticismListForOneCourse(HttpServletRequest request,String courseId){ + return WisdomResult.ok(); + } +} diff --git a/wisdom_web/src/main/java/com/smart/controller/LoginController.java b/wisdom_web/src/main/java/com/smart/controller/LoginController.java new file mode 100644 index 0000000..2d7ac41 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/LoginController.java @@ -0,0 +1,93 @@ +package com.smart.controller; + +import com.smart.pojo.*; +import com.smart.service.StudentLoginService; +import com.smart.service.TeacherLoginService; +import com.smart.service.WXLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; +@Controller +@CrossOrigin(origins = "*", maxAge = 3600) +@RequestMapping("/login") +//@SessionAttributes(value = {"tbStudent","tbTeacher"}) +public class LoginController { + @Autowired + private StudentLoginService studentLoginService; + + @Autowired + private TeacherLoginService teacherLoginService; + + @Autowired + private WXLoginService wxLoginService; + //,method = RequestMethod.POST + @RequestMapping("/all") + @ResponseBody + public WisdomResult webAppLogin(RequestLogin requestLogin, Model model, HttpServletRequest request){ + System.out.println(requestLogin); + WisdomResult result = null; + //判断一下是谁登陆 + if (requestLogin.getStatus() == 1){ + //学生，封装一下账号密码 + TbStudent tbStudent = new TbStudent(); + //账号 + tbStudent.setId(requestLogin.getAccount()); + //密码 + tbStudent.setPassword(requestLogin.getPassword()); + //调用service层,获取到结果 + result = studentLoginService.studentLoginOfWeb(tbStudent); + //将获取到的值存进session中 + StudentInfo studentInfo= (StudentInfo) result.getData(); + request.getSession().setAttribute("student",studentInfo); + request.getSession().setAttribute("status",1); + }else if (requestLogin.getStatus() == 2){ + //老师，封装一下账号密码 + TbTeacher tbTeacher = new TbTeacher(); + tbTeacher.setId(requestLogin.getAccount()); + tbTeacher.setPassword(requestLogin.getPassword()); + //调用service层 + result = teacherLoginService.teacherLoginOfWeb(tbTeacher); + //如果登陆成功将老师信息存在session中 + request.getSession().setAttribute("teacher",result.getData()); + request.getSession().setAttribute("status",2); + } + return result; + } + + + /** + * 微信小程序登陆，先要调用微信官网的api，固定参数 + * @param appid 小程序的id + * @param secret 小程序的appSecret + * @param js_code 登陆时获取的code + * @return 返回值 + */ + @RequestMapping("/weixinLogin") + @ResponseBody + public WisdomResult weiXinLogin(String appid , String secret , String js_code , String grant_type, HttpServletRequest request) + throws Exception{ + WisdomResult login = wxLoginService.login(appid, secret, js_code, grant_type); + //将openid存到session中去 + request.getSession().setAttribute("openid",login.getMsg()); + //判断是否登陆成功 + if (login.getStatus() == 1) { + request.getSession().setAttribute("student",(StudentInfo)login.getData()); + request.getSession().setAttribute("status",1); + }else if (login.getStatus() == 2) { + request.getSession().setAttribute("teacher",(TbTeacher)login.getData()); + request.getSession().setAttribute("status",2); + } + //将sessionid存进结果 + login.setData(request.getSession().getId()); + return login; + } + + + + +} diff --git a/wisdom_web/src/main/java/com/smart/controller/MonitorStudentAttController.java b/wisdom_web/src/main/java/com/smart/controller/MonitorStudentAttController.java new file mode 100644 index 0000000..cdcf692 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/MonitorStudentAttController.java @@ -0,0 +1,78 @@ +package com.smart.controller; + +import com.smart.pojo.ServiceMsg; +import com.smart.pojo.WisdomResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; + +/** + * 学生考勤监听 + */ +@RequestMapping("/monitorStudent") +@Controller +public class MonitorStudentAttController { + @Autowired + private ServletContext servletContext; + + + /** + * 向消息队列里面添加消息 + * @param msg 消息 + * @param status status:1--->睡觉 2--->迟到 + * @param id 学生学号 + */ + @RequestMapping("/setStudentStatus") + @ResponseBody + public WisdomResult getMsgFromPrictureServer(String msg,String status , String id, HttpServletRequest request) { + System.out.println(status + "+" + id); + //获取消息队列 + ArrayList msgQueue = (ArrayList) servletContext.getAttribute("queue"); + //判读消息队列是否为空 + if (msgQueue == null) { + msgQueue = new ArrayList<>(); + } + //创建消息 + ServiceMsg serviceMsg = new ServiceMsg(id,status,msg); + //放进消息队列中 + msgQueue.add(serviceMsg); + servletContext.setAttribute("queue", msgQueue); + System.out.println(msgQueue); + return WisdomResult.ok(); + } + + /** + * app获取消息队列 + * @param id 学生id + */ + @RequestMapping("/getStudentMsg") + @ResponseBody + public WisdomResult sendStudentMsgToApp(String id,HttpServletRequest request){ + + //获取消息队列 + ArrayList msgQueue = (ArrayList) servletContext.getAttribute("queue"); + System.out.println(msgQueue); + //判读消息队列是否存在 + if (msgQueue == null){ + return new WisdomResult(0,"无该学生的消息",null); + } + //循环遍历看有没有这个学生的信息 + for (ServiceMsg msg : msgQueue) { + if (msg.getId().equals(id)){ + //如果存在这个学生的id + //先从消息队列里面删了F + ServiceMsg serviceMsg = new ServiceMsg(msg.getId(),msg.getStatus(),msg.getMsg()); + msgQueue.remove(msg); + return WisdomResult.ok(serviceMsg); + } + } + //没有这个学生的信息 + return new WisdomResult(0,"没有该学生的消息",null); + } + +} diff --git a/wisdom_web/src/main/java/com/smart/controller/StudentAttendanceController.java b/wisdom_web/src/main/java/com/smart/controller/StudentAttendanceController.java new file mode 100644 index 0000000..f3247e8 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/StudentAttendanceController.java @@ -0,0 +1,339 @@ +package com.smart.controller; + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.WisdomResult; +import com.smart.service.StudentAttendanceService; +import com.smart.utils.DateUtils; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * 用来获取学生考勤信息的controller + */ +@Controller +@RequestMapping("studetnAttendance") +@CrossOrigin(origins = "*", maxAge = 3600) +public class StudentAttendanceController { + @Autowired + private StudentAttendanceService studentAttendanceService; + + /** + * 获取某一段时间内，某一个班级的考勤 + * @param start 开始时间 + * @param end 结束时间 + * @param courseId 课程id + */ + @RequestMapping("/oneCourseAtt") + @ResponseBody + public WisdomResult getSpellTimeAttendanceOfOneCourse(@RequestParam("start") DateTime start, + @RequestParam("end") DateTime end, + String courseId, String classId, + HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo) request.getSession().getAttribute("student"); + //调用service层方法 + WisdomResult timeAttendacneResult = studentAttendanceService.getSpellTimeAttendance(DateUtils.dateTimeToString(start), DateUtils.dateTimeToString(end), + classId, courseId); + return timeAttendacneResult; + } + + /** + * 通过传输来的课程id，与起始时间计算出该学生这段时间内该课程的考勤信息 + * @param start 开始时间 + * @param end 结束时间 + * @param courseId 课程id + */ + @RequestMapping("/getCourseOfStudentWithSpellTime") + @ResponseBody + public WisdomResult getSpellTimeAttOfStudentCourse(String start, String end, + String courseId,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getSpellTimeAttendanceOfOneCourse(start, end, studentInfo, courseId); + return result; + } + + /** + * 查询本周某一节课的考勤信息 + * @param courseId 课程id + */ + @RequestMapping("/oneCourseAttThisWeek") + @ResponseBody + public WisdomResult getThisWeekOneCourseAtt(String courseId,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getThisWeekAttendanceOfOneCourse(studentInfo, courseId); + return res; + } + + /** + * 查询上一周某一节课的考勤信息 + * @param courseId 课程id + */ + @RequestMapping("/oneCourseAttLastWeek") + @ResponseBody + public WisdomResult getLastWeekOneCourseAtt(String courseId,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getLastWeekAttendanceOfOneCourse(studentInfo, courseId); + return res; + } + + /** + * 查询本月某一节课的考勤信息 + * @param courseId 课程id + */ + @RequestMapping("/oneCourseAttThisMonth") + @ResponseBody + public WisdomResult getThisMonthOneCourseAtt(String courseId,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getThisMonthAttendanceOfOneCourse(studentInfo, courseId); + return res; + } + + /** + * 查询上一月某一节课的考勤信息 + * @param courseId 课程id + */ + @RequestMapping("/oneCourseAttLastMonth") + @ResponseBody + public WisdomResult getLastMonthOneCourseAtt(String courseId,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getLastMonthAttendanceOfOneCourse(studentInfo, courseId); + return res; + } + + /** + * 查询这个学期的课程信息 + * @param courseId 课程id + */ + @RequestMapping("/oneCourseAttThisSemester") + @ResponseBody + public WisdomResult getThisSemesterOneCourseAtt(String courseId,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getThisSemesterAttendanceOfOneCourse(studentInfo, courseId); + return res; + } + + /** + * 查询该学生一段时间内的所有课程的考勤信息 + */ + @RequestMapping("/allCourseAttASpellTime") + @ResponseBody + public WisdomResult getASpellTimeAllCourseAtt(@RequestParam("start")DateTime start,@RequestParam("end")DateTime end, HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getASpellTimeAttendanceOfAllCoourse(DateUtils.dateTimeToString(start), + DateUtils.dateTimeToString(end),studentInfo); + return res; + } + + /** + * 查询该学生开学到现在内的所有课程的考勤信息 + */ + @RequestMapping("/allCourseAttThisSemester") + @ResponseBody + public WisdomResult getThisSemesterAllCourseAtt(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getThisSemesterAttendanceOfAllCoourse(studentInfo); + return res; + } + + /** + * 查询该学生本周内的所有课程的考勤信息 + */ + @RequestMapping("/allCourseAttThisWeek") + @ResponseBody + public WisdomResult getThisWeekAllCourseAtt(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getThisWeekAttendanceOfAllCoourse(studentInfo); + return res; + } + + /** + * 查询该学生上周内的所有课程的考勤信息 + */ + @RequestMapping("/allCourseAttLastWeek") + @ResponseBody + public WisdomResult getLastWeekAllCourseAtt(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getLastWeekAttendanceOfAllCoourse(studentInfo); + return res; + } + + /** + * 查询该学生本月内的所有课程的考勤信息 + */ + @RequestMapping("/allCourseAttThisMonth") + @ResponseBody + public WisdomResult getThisMonthAllCourseAtt(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getThisMonthAttendanceOfAllCoourse(studentInfo); + return res; + } + + /** + * 查询该学生上月内的所有课程的考勤信息 + */ + @RequestMapping("/allCourseAttLastMonth") + @ResponseBody + public WisdomResult getLastMonthAllCourseAtt(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult res = studentAttendanceService.getLastMonthAttendanceOfAllCoourse(studentInfo); + return res; + } + + + /** + * ***************************************************************** + * 查询每天的考勤统计 + * 平均得分 几节课 哪一天 平均抬头率 + */ + + /** + * 查询一段时间内的每一天的大概考勤信息以及统计这段时间的东西 + */ + @RequestMapping("/getProAttOfST") + @ResponseBody + public WisdomResult getASpellTimeProbableAttOfEveryday(@RequestParam("start")DateTime start, + @RequestParam("end")DateTime end,HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getASpellTimeProbableAttOfEveryday(studentInfo, DateUtils.dateTimeToString(start), + DateUtils.dateTimeToString(end)); + return result; + } + /** + * 查询本周的大概考勤信息以及统计这段时间的东西 + */ + @RequestMapping("/getProAttOfTW") + @ResponseBody + public WisdomResult getThisWeekProbableAttOfEveryday(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getThisWeekProbableAttOfEveryday(studentInfo); + return result; + } + /** + * 查询上一周的大概考勤信息以及统计这段时间的东西 + */ + @RequestMapping("/getProAttOfLW") + @ResponseBody + public WisdomResult getLastWeekProbableAttOfEveryday(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getLastWeekProbableAttOfEveryday(studentInfo); + return result; + } + /** + * 查询本月的每一天的大概考勤信息以及统计这段时间的东西 + */ + @RequestMapping("/getProAttOfTM") + @ResponseBody + public WisdomResult getThisMonthProbableAttOfEveryday(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getThisMonthProbableAttOfEveryday(studentInfo); + return result; + } + /** + * 查询上个月的每一天的大概考勤信息以及统计这段时间的东西 + */ + @RequestMapping("/getProAttOfLM") + @ResponseBody + public WisdomResult getLastMonthProbableAttOfEveryday(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getLastMonthProbableAttOfEveryday(studentInfo); + return result; + } + /** + * 查询某天的考勤大致情况 + */ + @RequestMapping("/getProAttOfOD") + @ResponseBody + public WisdomResult getOneDayProbableAttOfEveryday(@RequestParam("oneday")DateTime oneday, HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getOneDayProbableAttOfEveryday(studentInfo, + DateUtils.dateTimeToString(oneday)); + return result; + } + /** + * 查询今天的考勤大致情况 + */ + @RequestMapping("/getProAttOfT") + @ResponseBody + public WisdomResult getTodayProbableAttOfEveryday(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.gettodayProbableAttOfEveryday(studentInfo); + return result; + } + /** + * 查询这个学期的考勤大致情况 + */ + @RequestMapping("/getProAttOfTS") + @ResponseBody + public WisdomResult getThisSemesterProbableAttOfEveryday(Integer page,Integer size,HttpServletRequest request){ + if (page == null || page == 0 ) + page = 1; + if (size == null || size == 0) + size = 15; + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service方法 + WisdomResult result = studentAttendanceService.getThisSemesterProbableAttOfEveryday(page,size,studentInfo); + return result; + } + + /** + * 昨天与今天 + */ + @RequestMapping("/yesAndTodayDiff") + @ResponseBody + public WisdomResult getYesterdayWithTodayAttDiff(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service + WisdomResult result = studentAttendanceService.getYesterdayWithTodayAttDiff(studentInfo); + return result; + } + /** + * 这周与上周 + */ + @RequestMapping("/lastAndThisWeekDiff") + @ResponseBody + public WisdomResult getLastWeekWithThisWeekAttDiff(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service + WisdomResult result = studentAttendanceService.getLastWeekWithThisWeekAttDiff(studentInfo); + return result; + } + + /** + * 这月与上月 + */ + @RequestMapping("/lastAndThisMonthDiff") + @ResponseBody + public WisdomResult getLastMonthWithThisMonthAttDiff(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo)request.getSession().getAttribute("student"); + //调用service + WisdomResult result = studentAttendanceService.getLastMonthWithThisMonthAttDiff(studentInfo); + return result; + } + + +} diff --git a/wisdom_web/src/main/java/com/smart/controller/StudentCourseInfoController.java b/wisdom_web/src/main/java/com/smart/controller/StudentCourseInfoController.java new file mode 100644 index 0000000..74e9099 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/StudentCourseInfoController.java @@ -0,0 +1,163 @@ +package com.smart.controller; + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.WisdomResult; +import com.smart.service.StudentCourseService; +import com.smart.utils.DateUtils; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * 查询学生课程信息的controller + */ +@Controller +@RequestMapping("/studentCourseInfo") +@CrossOrigin(origins = {"*", "null"}) +public class StudentCourseInfoController { + @Autowired + private StudentCourseService studentCourseService; + + /** + * 获取一段时间内的课程 + * @param begin 开始时间 + * @param end 结束时间 + * @return 含有信息的结果集 + */ + @RequestMapping("/getASpellTime") + @ResponseBody + public WisdomResult getCourseListSpellTime(DateTime begin ,DateTime end, ModelMap modelMap, HttpServletRequest request){ + //先获取学生的信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用service函数 + WisdomResult courseOfSpellTime = studentCourseService.getCourseOfSpellTime(student, DateUtils.dateTimeToString(begin), DateUtils.dateTimeToString(end)); + return courseOfSpellTime; + } + + /** + * 获取本周的课程 + */ + @RequestMapping("/thisWeek") + @ResponseBody + public WisdomResult getCourseListThisWeek(HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + System.out.println(student); + //调用service方法，获取返回值 + WisdomResult result = studentCourseService.getCourseThisWeek(student); + return result; + } + + /** + * 获取该月的课程信息 + */ + @RequestMapping("/thisMonth") + @ResponseBody + public WisdomResult getCourseListThisMonth(HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseThisMonth(student); + return result; + } + + /** + * 获取前x星期的课程信息 + */ + @RequestMapping("/frontXWeek") + @ResponseBody + public WisdomResult getCourseListFrontXWeek(Integer n , HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseFrontOfXWeek(student, n); + return result; + } + + /** + * 获取前x月的课程信息 + */ + @RequestMapping("/frontXMonth") + @ResponseBody + public WisdomResult getCourseListFrontXMonth(Integer n , HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseFrontOfXMonth(student, n); + return result; + } + + /** + * 第x月的考勤 + */ + @RequestMapping("/xMonth") + @ResponseBody + public WisdomResult getCourseListXMonth(Integer n , HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseInXMonth(student, n); + return result; + } + + /** + * 第x周的考勤 + */ + @RequestMapping("xWeek") + @ResponseBody + public WisdomResult getCourseListXWeek(Integer n , HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法 获取返回值 + WisdomResult result = studentCourseService.getCourseInXWeek(student, n); + return result; + } + + /** + * 获取今天的课程信息 + */ + @RequestMapping("/today") + @ResponseBody + public WisdomResult getCourseList(HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseOfToday(student); + return result; + } + + /** + * 获取这个学期的课程 + */ + @RequestMapping("/thisSemester") + @ResponseBody + public WisdomResult getCourseListSemester(HttpServletRequest request){ + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseOfThisSemester(student); + return result; + } + + /** + * 获取某一天的课程 + */ + @RequestMapping("/oneday") + @ResponseBody + public WisdomResult getCourseListOneday(HttpServletRequest request ,@RequestParam("dateTime") DateTime datetime){ + //转换一下时间的格式 + //先获取学生信息 + StudentInfo student = (StudentInfo) request.getSession().getAttribute("student"); + //调用方法，获取返回值 + WisdomResult result = studentCourseService.getCourseOfDay(student, DateUtils.dateTimeToString(datetime)); + return result; + } + +} diff --git a/wisdom_web/src/main/java/com/smart/controller/StudentInfoController.java b/wisdom_web/src/main/java/com/smart/controller/StudentInfoController.java new file mode 100644 index 0000000..9af648f --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/StudentInfoController.java @@ -0,0 +1,27 @@ +package com.smart.controller; + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.TbStudent; +import com.smart.pojo.WisdomResult; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +@Controller +@CrossOrigin(origins = "*", maxAge = 3600) +@RequestMapping("/weixin") +public class StudentInfoController { + + /** + * 返回学生信息 + */ + @RequestMapping("/getStudentInfo") + @ResponseBody + public WisdomResult getStudentInfo(HttpServletRequest request){ + StudentInfo studentInfo = (StudentInfo) request.getSession().getAttribute("student"); + return WisdomResult.ok(studentInfo); + } +} diff --git a/wisdom_web/src/main/java/com/smart/controller/TeacherAttendanceController.java b/wisdom_web/src/main/java/com/smart/controller/TeacherAttendanceController.java new file mode 100644 index 0000000..0c4fde8 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/TeacherAttendanceController.java @@ -0,0 +1,102 @@ +package com.smart.controller; + +import com.smart.pojo.TeacherInfo; +import com.smart.pojo.WisdomResult; +import com.smart.service.TeacherAttendanceService; +import com.smart.utils.DateUtils; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * 老师查询考勤 + */ +@Controller +@RequestMapping("/teacherAttendance") +public class TeacherAttendanceController { + @Autowired + private TeacherAttendanceService teacherAttendanceService; + + /** + * 查询某一节课某个同学缺勤次数 + */ + public WisdomResult getAbsentOfACourse(String studentId , String courseId){ + + WisdomResult result = teacherAttendanceService.getStudentAbsentOfOneCourse(null, null, courseId, studentId); + return result; + } + + /** + * 按照条件查询具体时间的每天上课的考勤信息 + * @param start 开始时间 + * @param end 结束时间 + * @param status 条件 + */ + @RequestMapping("/getAttOfClassAtASpellTime") + @ResponseBody + public WisdomResult getAttOfOneClass(HttpServletRequest request,String start,String end,int status){ + //获取老师信息 + TeacherInfo teacherInfo = (TeacherInfo) request.getSession().getAttribute("teacher"); + WisdomResult result = null; + //判断条件 + if (status == 1){ + //查询今天的 + result = teacherAttendanceService.getAttToday(teacherInfo); + }else if (status == 2){ + //查询这周的 + result = teacherAttendanceService.getAttThisWeek(teacherInfo); + }else if (status == 3){ + //查询这个月的 + result = teacherAttendanceService.getAttThisMont(teacherInfo); + }else if (status == 4){ + //查询这学期的 + result = teacherAttendanceService.getAttThisSemester(teacherInfo); + }else if (status == 5){ + //查询某一天的 + result = teacherAttendanceService.getAttOfOneDay(start,teacherInfo); + }else if (status == 6){ + //查询某一区间的 + result = teacherAttendanceService.getAttASpellTime(start,end,teacherInfo); + } + return result; + } + + /** + * 通过courseItem查询这整个一节课中所有学生的考勤信息 + * @param courseItemId 某一节具体课程的id + */ + @RequestMapping("/getStudentAttWithCourseItem") + @ResponseBody + public WisdomResult getAllStudentAttWithCourseItemId(String courseItemId){ + return teacherAttendanceService.getAttOfClass(courseItemId); + } + + /** + * 通过学生id和课程id查出这个学生整个学期的平均考勤统计 + * @param studentId 学生id + * @param courseId 课程id + */ + @RequestMapping("/getStudentAttInCourse") + @ResponseBody + public WisdomResult getAStudentAttInCourse(String studentId,String courseId){ + WisdomResult result = teacherAttendanceService.getStudentAttOfCourse(studentId, courseId); + return result; + } + + /** + * 查询这个学生这个学期每一节这个课都对应的考勤信息 + * @param studentId 学生id + * @param courseId 课程id + */ + @RequestMapping("/getStudentAttInEveryCourse") + @ResponseBody + public WisdomResult getStudentAttInEveryCourse(String studentId,String courseId){ + WisdomResult studentAttInEveryCourse = teacherAttendanceService.getStudentAttInEveryCourse(studentId, courseId); + return studentAttInEveryCourse; + } + +} diff --git a/wisdom_web/src/main/java/com/smart/controller/WeiXinLoginController.java b/wisdom_web/src/main/java/com/smart/controller/WeiXinLoginController.java new file mode 100644 index 0000000..41e06a2 --- /dev/null +++ b/wisdom_web/src/main/java/com/smart/controller/WeiXinLoginController.java @@ -0,0 +1,48 @@ +package com.smart.controller; + + +import com.smart.pojo.StudentInfo; +import com.smart.pojo.TbStudent; +import com.smart.pojo.TbTeacher; +import com.smart.pojo.WisdomResult; +import com.smart.service.WXLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +@Controller +@RequestMapping("/wx1") +@CrossOrigin(origins = "*", maxAge = 3600) +public class WeiXinLoginController { + @Autowired + private WXLoginService wxLoginService; + /** + * 绑定帐号与openid + * @param account 账号 + * @param password 密码 + * @param status 状态 + */ + @RequestMapping("bindOpenid") + @ResponseBody + public WisdomResult bindOpenidWithAccount(String openid1,String account, String password, int status, + HttpServletRequest request){ + //获取openid + String openid = (String) request.getSession().getAttribute("openid"); + //调用service绑定openid与账号 + WisdomResult wisdomResult = wxLoginService.bindOpenidWithAccount(openid1, account, password, status); + //判断该人为老师还是学生，把对应的变量存入session中 + if (wisdomResult.getStatus() == 1){ + request.getSession().setAttribute("status",1); + request.getSession().setAttribute("student",(StudentInfo)wisdomResult.getData()); + }else if (wisdomResult.getStatus() == 2){ + request.getSession().setAttribute("status",2); + request.getSession().setAttribute("student",(TbTeacher)wisdomResult.getData()); + } + //返回结果 + return wisdomResult; + } +} diff --git a/wisdom_web/src/main/java/com/smart/controller/test.java b/wisdom_web/src/main/java/com/smart/controller/test.java index 0d85287..670b7b0 100644 --- a/wisdom_web/src/main/java/com/smart/controller/test.java +++ b/wisdom_web/src/main/java/com/smart/controller/test.java @@ -1,4 +1,20 @@ package com.smart.controller; +import com.smart.service.WXLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +@Controller public class test { +@Autowired +private WXLoginService wxLoginServiceImpl; + + @RequestMapping("/test") + @ResponseBody + public String test(){ + return wxLoginServiceImpl.test(); + } } diff --git a/wisdom_web/src/main/resources/log4j.properties b/wisdom_web/src/main/resources/log4j.properties index 3802802..ab1f79a 100644 --- a/wisdom_web/src/main/resources/log4j.properties +++ b/wisdom_web/src/main/resources/log4j.properties @@ -1,4 +1,18 @@ -log4j.rootLogger=WARN,A1 -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c]-[%p] %m%n \ No newline at end of file +#Set root category priority to INFO and its only appender to CONSOLE +#log4j.rooCategory=INFO,CONSOLE debug info warn error fatal +log4j.rootCategory=debug,CONSOLE,LOGFILE + +#Set the enterprise logger category to FATAL and its only appender to CONSOLE. +log4j.logger.org.apache.axis.enterprise=FATAL,CONSOLE + +#CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-6r [%15.15t] %-5p %30.30c %x - %m\n + +#CONSOLE is set to be a File appender +log4j.appender.LOGFILE=org.apache.log4j.FileAppender +log4j.appender.LOGFILE.File=h:\\web.log +log4j.appender.LOGFILE.Append=true +log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout +log4j.appender.LOGFILE.layout.ConversionPattern=%d{ISO8601} %-6r [%15.15t] %-5p %30.30c %x - %m\n diff --git a/wisdom_web/src/main/resources/spring/springmvc.xml b/wisdom_web/src/main/resources/spring/springmvc.xml index 0cda8a4..5a97a2a 100644 --- a/wisdom_web/src/main/resources/spring/springmvc.xml +++ b/wisdom_web/src/main/resources/spring/springmvc.xml @@ -11,19 +11,34 @@ - + + + + + + + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/wisdom_web/target/classes/com/smart/controller/test.class b/wisdom_web/target/classes/com/smart/controller/test.class deleted file mode 100644 index a8b9a81..0000000 Binary files a/wisdom_web/target/classes/com/smart/controller/test.class and /dev/null differ diff --git a/wisdom_web/target/classes/log4j.properties b/wisdom_web/target/classes/log4j.properties deleted file mode 100644 index 3802802..0000000 --- a/wisdom_web/target/classes/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=WARN,A1 -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c]-[%p] %m%n \ No newline at end of file diff --git a/wisdom_web/target/classes/spring/springmvc.xml b/wisdom_web/target/classes/spring/springmvc.xml deleted file mode 100644 index 0cda8a4..0000000 --- a/wisdom_web/target/classes/spring/springmvc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wisdom_web/target/maven-archiver/pom.properties b/wisdom_web/target/maven-archiver/pom.properties deleted file mode 100644 index 9847885..0000000 --- a/wisdom_web/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 28 15:24:59 CST 2019 -version=1.0-SNAPSHOT -groupId=com.smart -artifactId=wisdom_web diff --git a/wisdom_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/wisdom_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 112fda1..0000000 --- a/wisdom_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -com\smart\controller\test.class diff --git a/wisdom_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/wisdom_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 164e59d..0000000 --- a/wisdom_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\IDEAworkspace\git_wisdom\wisdom_web\src\main\java\com\smart\controller\test.java diff --git a/wisdom_web/target/tomcat/conf/logging.properties b/wisdom_web/target/tomcat/conf/logging.properties deleted file mode 100644 index 76c9512..0000000 --- a/wisdom_web/target/tomcat/conf/logging.properties +++ /dev/null @@ -1,64 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -1catalina.org.apache.juli.FileHandler.level = FINE -1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -1catalina.org.apache.juli.FileHandler.prefix = catalina. - -2localhost.org.apache.juli.FileHandler.level = FINE -2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -2localhost.org.apache.juli.FileHandler.prefix = localhost. - -3manager.org.apache.juli.FileHandler.level = FINE -3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -3manager.org.apache.juli.FileHandler.prefix = manager. - -4host-manager.org.apache.juli.FileHandler.level = FINE -4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -4host-manager.org.apache.juli.FileHandler.prefix = host-manager. - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler - -# For example, set the org.apache.catalina.util.LifecycleBase logger to log -# each component that extends LifecycleBase changing state: -#org.apache.catalina.util.LifecycleBase.level = FINE - -# To see debug messages in TldLocationsCache, uncomment the following line: -#org.apache.jasper.compiler.TldLocationsCache.level = FINE diff --git a/wisdom_web/target/tomcat/conf/tomcat-users.xml b/wisdom_web/target/tomcat/conf/tomcat-users.xml deleted file mode 100644 index 7114f5d..0000000 --- a/wisdom_web/target/tomcat/conf/tomcat-users.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/wisdom_web/target/tomcat/conf/web.xml b/wisdom_web/target/tomcat/conf/web.xml deleted file mode 100644 index cc8383c..0000000 --- a/wisdom_web/target/tomcat/conf/web.xml +++ /dev/null @@ -1,4283 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - / - - - - - jsp - *.jsp - *.jspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - 123 - application/vnd.lotus-1-2-3 - - - 3dml - text/vnd.in3d.3dml - - - 3g2 - video/3gpp2 - - - 3gp - video/3gpp - - - 7z - application/x-7z-compressed - - - aab - application/x-authorware-bin - - - aac - audio/x-aac - - - aam - application/x-authorware-map - - - aas - application/x-authorware-seg - - - abs - audio/x-mpeg - - - abw - application/x-abiword - - - ac - application/pkix-attr-cert - - - acc - application/vnd.americandynamics.acc - - - ace - application/x-ace-compressed - - - acu - application/vnd.acucobol - - - acutc - application/vnd.acucorp - - - adp - audio/adpcm - - - aep - application/vnd.audiograph - - - afm - application/x-font-type1 - - - afp - application/vnd.ibm.modcap - - - ahead - application/vnd.ahead.space - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - air - application/vnd.adobe.air-application-installer-package+zip - - - ait - application/vnd.dvb.ait - - - ami - application/vnd.amiga.ami - - - anx - application/annodex - - - apk - application/vnd.android.package-archive - - - application - application/x-ms-application - - - apr - application/vnd.lotus-approach - - - art - image/x-jg - - - asc - application/pgp-signature - - - asf - video/x-ms-asf - - - asm - text/x-asm - - - aso - application/vnd.accpac.simply.aso - - - asx - video/x-ms-asf - - - atc - application/vnd.acucorp - - - atom - application/atom+xml - - - atomcat - application/atomcat+xml - - - atomsvc - application/atomsvc+xml - - - atx - application/vnd.antix.game-component - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - aw - application/applixware - - - axa - audio/annodex - - - axv - video/annodex - - - azf - application/vnd.airzip.filesecure.azf - - - azs - application/vnd.airzip.filesecure.azs - - - azw - application/vnd.amazon.ebook - - - bat - application/x-msdownload - - - bcpio - application/x-bcpio - - - bdf - application/x-font-bdf - - - bdm - application/vnd.syncml.dm+wbxml - - - bed - application/vnd.realvnc.bed - - - bh2 - application/vnd.fujitsu.oasysprs - - - bin - application/octet-stream - - - bmi - application/vnd.bmi - - - bmp - image/bmp - - - body - text/html - - - book - application/vnd.framemaker - - - box - application/vnd.previewsystems.box - - - boz - application/x-bzip2 - - - bpk - application/octet-stream - - - btif - image/prs.btif - - - bz - application/x-bzip - - - bz2 - application/x-bzip2 - - - c - text/x-c - - - c11amc - application/vnd.cluetrust.cartomobile-config - - - c11amz - application/vnd.cluetrust.cartomobile-config-pkg - - - c4d - application/vnd.clonk.c4group - - - c4f - application/vnd.clonk.c4group - - - c4g - application/vnd.clonk.c4group - - - c4p - application/vnd.clonk.c4group - - - c4u - application/vnd.clonk.c4group - - - cab - application/vnd.ms-cab-compressed - - - cap - application/vnd.tcpdump.pcap - - - car - application/vnd.curl.car - - - cat - application/vnd.ms-pki.seccat - - - cc - text/x-c - - - cct - application/x-director - - - ccxml - application/ccxml+xml - - - cdbcmsg - application/vnd.contact.cmsg - - - cdf - application/x-cdf - - - cdkey - application/vnd.mediastation.cdkey - - - cdmia - application/cdmi-capability - - - cdmic - application/cdmi-container - - - cdmid - application/cdmi-domain - - - cdmio - application/cdmi-object - - - cdmiq - application/cdmi-queue - - - cdx - chemical/x-cdx - - - cdxml - application/vnd.chemdraw+xml - - - cdy - application/vnd.cinderella - - - cer - application/pkix-cert - - - cgm - image/cgm - - - chat - application/x-chat - - - chm - application/vnd.ms-htmlhelp - - - chrt - application/vnd.kde.kchart - - - cif - chemical/x-cif - - - cii - application/vnd.anser-web-certificate-issue-initiation - - - cil - application/vnd.ms-artgalry - - - cla - application/vnd.claymore - - - class - application/java - - - clkk - application/vnd.crick.clicker.keyboard - - - clkp - application/vnd.crick.clicker.palette - - - clkt - application/vnd.crick.clicker.template - - - clkw - application/vnd.crick.clicker.wordbank - - - clkx - application/vnd.crick.clicker - - - clp - application/x-msclip - - - cmc - application/vnd.cosmocaller - - - cmdf - chemical/x-cmdf - - - cml - chemical/x-cml - - - cmp - application/vnd.yellowriver-custom-menu - - - cmx - image/x-cmx - - - cod - application/vnd.rim.cod - - - com - application/x-msdownload - - - conf - text/plain - - - cpio - application/x-cpio - - - cpp - text/x-c - - - cpt - application/mac-compactpro - - - crd - application/x-mscardfile - - - crl - application/pkix-crl - - - crt - application/x-x509-ca-cert - - - cryptonote - application/vnd.rig.cryptonote - - - csh - application/x-csh - - - csml - chemical/x-csml - - - csp - application/vnd.commonspace - - - css - text/css - - - cst - application/x-director - - - csv - text/csv - - - cu - application/cu-seeme - - - curl - text/vnd.curl - - - cww - application/prs.cww - - - cxt - application/x-director - - - cxx - text/x-c - - - dae - model/vnd.collada+xml - - - daf - application/vnd.mobius.daf - - - dataless - application/vnd.fdsn.seed - - - davmount - application/davmount+xml - - - dcr - application/x-director - - - dcurl - text/vnd.curl.dcurl - - - dd2 - application/vnd.oma.dd2+xml - - - ddd - application/vnd.fujixerox.ddd - - - deb - application/x-debian-package - - - def - text/plain - - - deploy - application/octet-stream - - - der - application/x-x509-ca-cert - - - dfac - application/vnd.dreamfactory - - - dib - image/bmp - - - dic - text/x-c - - - dir - application/x-director - - - dis - application/vnd.mobius.dis - - - dist - application/octet-stream - - - distz - application/octet-stream - - - djv - image/vnd.djvu - - - djvu - image/vnd.djvu - - - dll - application/x-msdownload - - - dmg - application/octet-stream - - - dmp - application/vnd.tcpdump.pcap - - - dms - application/octet-stream - - - dna - application/vnd.dna - - - doc - application/msword - - - docm - application/vnd.ms-word.document.macroenabled.12 - - - docx - application/vnd.openxmlformats-officedocument.wordprocessingml.document - - - dot - application/msword - - - dotm - application/vnd.ms-word.template.macroenabled.12 - - - dotx - application/vnd.openxmlformats-officedocument.wordprocessingml.template - - - dp - application/vnd.osgi.dp - - - dpg - application/vnd.dpgraph - - - dra - audio/vnd.dra - - - dsc - text/prs.lines.tag - - - dssc - application/dssc+der - - - dtb - application/x-dtbook+xml - - - dtd - application/xml-dtd - - - dts - audio/vnd.dts - - - dtshd - audio/vnd.dts.hd - - - dump - application/octet-stream - - - dv - video/x-dv - - - dvb - video/vnd.dvb.file - - - dvi - application/x-dvi - - - dwf - model/vnd.dwf - - - dwg - image/vnd.dwg - - - dxf - image/vnd.dxf - - - dxp - application/vnd.spotfire.dxp - - - dxr - application/x-director - - - ecelp4800 - audio/vnd.nuera.ecelp4800 - - - ecelp7470 - audio/vnd.nuera.ecelp7470 - - - ecelp9600 - audio/vnd.nuera.ecelp9600 - - - ecma - application/ecmascript - - - edm - application/vnd.novadigm.edm - - - edx - application/vnd.novadigm.edx - - - efif - application/vnd.picsel - - - ei6 - application/vnd.pg.osasli - - - elc - application/octet-stream - - - eml - message/rfc822 - - - emma - application/emma+xml - - - eol - audio/vnd.digital-winds - - - eot - application/vnd.ms-fontobject - - - eps - application/postscript - - - epub - application/epub+zip - - - es3 - application/vnd.eszigno3+xml - - - esf - application/vnd.epson.esf - - - et3 - application/vnd.eszigno3+xml - - - etx - text/x-setext - - - exe - application/octet-stream - - - exi - application/exi - - - ext - application/vnd.novadigm.ext - - - ez - application/andrew-inset - - - ez2 - application/vnd.ezpix-album - - - ez3 - application/vnd.ezpix-package - - - f - text/x-fortran - - - f4v - video/x-f4v - - - f77 - text/x-fortran - - - f90 - text/x-fortran - - - fbs - image/vnd.fastbidsheet - - - fcs - application/vnd.isac.fcs - - - fdf - application/vnd.fdf - - - fe_launch - application/vnd.denovo.fcselayout-link - - - fg5 - application/vnd.fujitsu.oasysgp - - - fgd - application/x-director - - - fh - image/x-freehand - - - fh4 - image/x-freehand - - - fh5 - image/x-freehand - - - fh7 - image/x-freehand - - - fhc - image/x-freehand - - - fig - application/x-xfig - - - flac - audio/flac - - - fli - video/x-fli - - - flo - application/vnd.micrografx.flo - - - flv - video/x-flv - - - flw - application/vnd.kde.kivio - - - flx - text/vnd.fmi.flexstor - - - fly - text/vnd.fly - - - fm - application/vnd.framemaker - - - fnc - application/vnd.frogans.fnc - - - for - text/x-fortran - - - fpx - image/vnd.fpx - - - frame - application/vnd.framemaker - - - fsc - application/vnd.fsc.weblaunch - - - fst - image/vnd.fst - - - ftc - application/vnd.fluxtime.clip - - - fti - application/vnd.anser-web-funds-transfer-initiation - - - fvt - video/vnd.fvt - - - fxp - application/vnd.adobe.fxp - - - fxpl - application/vnd.adobe.fxp - - - fzs - application/vnd.fuzzysheet - - - g2w - application/vnd.geoplan - - - g3 - image/g3fax - - - g3w - application/vnd.geospace - - - gac - application/vnd.groove-account - - - gbr - application/rpki-ghostbusters - - - gdl - model/vnd.gdl - - - geo - application/vnd.dynageo - - - gex - application/vnd.geometry-explorer - - - ggb - application/vnd.geogebra.file - - - ggt - application/vnd.geogebra.tool - - - ghf - application/vnd.groove-help - - - gif - image/gif - - - gim - application/vnd.groove-identity-message - - - gmx - application/vnd.gmx - - - gnumeric - application/x-gnumeric - - - gph - application/vnd.flographit - - - gqf - application/vnd.grafeq - - - gqs - application/vnd.grafeq - - - gram - application/srgs - - - gre - application/vnd.geometry-explorer - - - grv - application/vnd.groove-injector - - - grxml - application/srgs+xml - - - gsf - application/x-font-ghostscript - - - gtar - application/x-gtar - - - gtm - application/vnd.groove-tool-message - - - gtw - model/vnd.gtw - - - gv - text/vnd.graphviz - - - gxt - application/vnd.geonext - - - gz - application/x-gzip - - - h - text/x-c - - - h261 - video/h261 - - - h263 - video/h263 - - - h264 - video/h264 - - - hal - application/vnd.hal+xml - - - hbci - application/vnd.hbci - - - hdf - application/x-hdf - - - hh - text/x-c - - - hlp - application/winhlp - - - hpgl - application/vnd.hp-hpgl - - - hpid - application/vnd.hp-hpid - - - hps - application/vnd.hp-hps - - - hqx - application/mac-binhex40 - - - htc - text/x-component - - - htke - application/vnd.kenameaapp - - - htm - text/html - - - html - text/html - - - hvd - application/vnd.yamaha.hv-dic - - - hvp - application/vnd.yamaha.hv-voice - - - hvs - application/vnd.yamaha.hv-script - - - i2g - application/vnd.intergeo - - - icc - application/vnd.iccprofile - - - ice - x-conference/x-cooltalk - - - icm - application/vnd.iccprofile - - - ico - image/x-icon - - - ics - text/calendar - - - ief - image/ief - - - ifb - text/calendar - - - ifm - application/vnd.shana.informed.formdata - - - iges - model/iges - - - igl - application/vnd.igloader - - - igm - application/vnd.insors.igm - - - igs - model/iges - - - igx - application/vnd.micrografx.igx - - - iif - application/vnd.shana.informed.interchange - - - imp - application/vnd.accpac.simply.imp - - - ims - application/vnd.ms-ims - - - in - text/plain - - - ink - application/inkml+xml - - - inkml - application/inkml+xml - - - iota - application/vnd.astraea-software.iota - - - ipfix - application/ipfix - - - ipk - application/vnd.shana.informed.package - - - irm - application/vnd.ibm.rights-management - - - irp - application/vnd.irepository.package+xml - - - iso - application/octet-stream - - - itp - application/vnd.shana.informed.formtemplate - - - ivp - application/vnd.immervision-ivp - - - ivu - application/vnd.immervision-ivu - - - jad - text/vnd.sun.j2me.app-descriptor - - - jam - application/vnd.jam - - - jar - application/java-archive - - - java - text/x-java-source - - - jisp - application/vnd.jisp - - - jlt - application/vnd.hp-jlyt - - - jnlp - application/x-java-jnlp-file - - - joda - application/vnd.joost.joda-archive - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - jpgm - video/jpm - - - jpgv - video/jpeg - - - jpm - video/jpm - - - js - application/javascript - - - jsf - text/plain - - - json - application/json - - - jspf - text/plain - - - kar - audio/midi - - - karbon - application/vnd.kde.karbon - - - kfo - application/vnd.kde.kformula - - - kia - application/vnd.kidspiration - - - kml - application/vnd.google-earth.kml+xml - - - kmz - application/vnd.google-earth.kmz - - - kne - application/vnd.kinar - - - knp - application/vnd.kinar - - - kon - application/vnd.kde.kontour - - - kpr - application/vnd.kde.kpresenter - - - kpt - application/vnd.kde.kpresenter - - - ksp - application/vnd.kde.kspread - - - ktr - application/vnd.kahootz - - - ktx - image/ktx - - - ktz - application/vnd.kahootz - - - kwd - application/vnd.kde.kword - - - kwt - application/vnd.kde.kword - - - lasxml - application/vnd.las.las+xml - - - latex - application/x-latex - - - lbd - application/vnd.llamagraphics.life-balance.desktop - - - lbe - application/vnd.llamagraphics.life-balance.exchange+xml - - - les - application/vnd.hhe.lesson-player - - - lha - application/octet-stream - - - link66 - application/vnd.route66.link66+xml - - - list - text/plain - - - list3820 - application/vnd.ibm.modcap - - - listafp - application/vnd.ibm.modcap - - - log - text/plain - - - lostxml - application/lost+xml - - - lrf - application/octet-stream - - - lrm - application/vnd.ms-lrm - - - ltf - application/vnd.frogans.ltf - - - lvp - audio/vnd.lucent.voice - - - lwp - application/vnd.lotus-wordpro - - - lzh - application/octet-stream - - - m13 - application/x-msmediaview - - - m14 - application/x-msmediaview - - - m1v - video/mpeg - - - m21 - application/mp21 - - - m2a - audio/mpeg - - - m2v - video/mpeg - - - m3a - audio/mpeg - - - m3u - audio/x-mpegurl - - - m3u8 - application/vnd.apple.mpegurl - - - m4a - audio/mp4 - - - m4b - audio/mp4 - - - m4r - audio/mp4 - - - m4u - video/vnd.mpegurl - - - m4v - video/mp4 - - - ma - application/mathematica - - - mac - image/x-macpaint - - - mads - application/mads+xml - - - mag - application/vnd.ecowin.chart - - - maker - application/vnd.framemaker - - - man - text/troff - - - mathml - application/mathml+xml - - - mb - application/mathematica - - - mbk - application/vnd.mobius.mbk - - - mbox - application/mbox - - - mc1 - application/vnd.medcalcdata - - - mcd - application/vnd.mcd - - - mcurl - text/vnd.curl.mcurl - - - mdb - application/x-msaccess - - - mdi - image/vnd.ms-modi - - - me - text/troff - - - mesh - model/mesh - - - meta4 - application/metalink4+xml - - - mets - application/mets+xml - - - mfm - application/vnd.mfmp - - - mft - application/rpki-manifest - - - mgp - application/vnd.osgeo.mapguide.package - - - mgz - application/vnd.proteus.magazine - - - mid - audio/midi - - - midi - audio/midi - - - mif - application/x-mif - - - mime - message/rfc822 - - - mj2 - video/mj2 - - - mjp2 - video/mj2 - - - mlp - application/vnd.dolby.mlp - - - mmd - application/vnd.chipnuts.karaoke-mmd - - - mmf - application/vnd.smaf - - - mmr - image/vnd.fujixerox.edmics-mmr - - - mny - application/x-msmoney - - - mobi - application/x-mobipocket-ebook - - - mods - application/mods+xml - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/mpeg - - - mp2 - audio/mpeg - - - mp21 - application/mp21 - - - mp2a - audio/mpeg - - - mp3 - audio/mpeg - - - mp4 - video/mp4 - - - mp4a - audio/mp4 - - - mp4s - application/mp4 - - - mp4v - video/mp4 - - - mpa - audio/mpeg - - - mpc - application/vnd.mophun.certificate - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpg4 - video/mp4 - - - mpga - audio/mpeg - - - mpkg - application/vnd.apple.installer+xml - - - mpm - application/vnd.blueice.multipass - - - mpn - application/vnd.mophun.application - - - mpp - application/vnd.ms-project - - - mpt - application/vnd.ms-project - - - mpv2 - video/mpeg2 - - - mpy - application/vnd.ibm.minipay - - - mqy - application/vnd.mobius.mqy - - - mrc - application/marc - - - mrcx - application/marcxml+xml - - - ms - text/troff - - - mscml - application/mediaservercontrol+xml - - - mseed - application/vnd.fdsn.mseed - - - mseq - application/vnd.mseq - - - msf - application/vnd.epson.msf - - - msh - model/mesh - - - msi - application/x-msdownload - - - msl - application/vnd.mobius.msl - - - msty - application/vnd.muvee.style - - - mts - model/vnd.mts - - - mus - application/vnd.musician - - - musicxml - application/vnd.recordare.musicxml+xml - - - mvb - application/x-msmediaview - - - mwf - application/vnd.mfer - - - mxf - application/mxf - - - mxl - application/vnd.recordare.musicxml - - - mxml - application/xv+xml - - - mxs - application/vnd.triscape.mxs - - - mxu - video/vnd.mpegurl - - - n-gage - application/vnd.nokia.n-gage.symbian.install - - - n3 - text/n3 - - - nb - application/mathematica - - - nbp - application/vnd.wolfram.player - - - nc - application/x-netcdf - - - ncx - application/x-dtbncx+xml - - - ngdat - application/vnd.nokia.n-gage.data - - - nlu - application/vnd.neurolanguage.nlu - - - nml - application/vnd.enliven - - - nnd - application/vnd.noblenet-directory - - - nns - application/vnd.noblenet-sealer - - - nnw - application/vnd.noblenet-web - - - npx - image/vnd.net-fpx - - - nsf - application/vnd.lotus-notes - - - oa2 - application/vnd.fujitsu.oasys2 - - - oa3 - application/vnd.fujitsu.oasys3 - - - oas - application/vnd.fujitsu.oasys - - - obd - application/x-msbinder - - - oda - application/oda - - - - odb - application/vnd.oasis.opendocument.database - - - - odc - application/vnd.oasis.opendocument.chart - - - - odf - application/vnd.oasis.opendocument.formula - - - odft - application/vnd.oasis.opendocument.formula-template - - - - odg - application/vnd.oasis.opendocument.graphics - - - - odi - application/vnd.oasis.opendocument.image - - - - odm - application/vnd.oasis.opendocument.text-master - - - - odp - application/vnd.oasis.opendocument.presentation - - - - ods - application/vnd.oasis.opendocument.spreadsheet - - - - odt - application/vnd.oasis.opendocument.text - - - oga - audio/ogg - - - ogg - audio/ogg - - - ogv - video/ogg - - - - ogx - application/ogg - - - onepkg - application/onenote - - - onetmp - application/onenote - - - onetoc - application/onenote - - - onetoc2 - application/onenote - - - opf - application/oebps-package+xml - - - oprc - application/vnd.palm - - - org - application/vnd.lotus-organizer - - - osf - application/vnd.yamaha.openscoreformat - - - osfpvg - application/vnd.yamaha.openscoreformat.osfpvg+xml - - - otc - application/vnd.oasis.opendocument.chart-template - - - otf - application/x-font-otf - - - - otg - application/vnd.oasis.opendocument.graphics-template - - - - oth - application/vnd.oasis.opendocument.text-web - - - oti - application/vnd.oasis.opendocument.image-template - - - - otp - application/vnd.oasis.opendocument.presentation-template - - - - ots - application/vnd.oasis.opendocument.spreadsheet-template - - - - ott - application/vnd.oasis.opendocument.text-template - - - oxps - application/oxps - - - oxt - application/vnd.openofficeorg.extension - - - p - text/x-pascal - - - p10 - application/pkcs10 - - - p12 - application/x-pkcs12 - - - p7b - application/x-pkcs7-certificates - - - p7c - application/pkcs7-mime - - - p7m - application/pkcs7-mime - - - p7r - application/x-pkcs7-certreqresp - - - p7s - application/pkcs7-signature - - - p8 - application/pkcs8 - - - pas - text/x-pascal - - - paw - application/vnd.pawaafile - - - pbd - application/vnd.powerbuilder6 - - - pbm - image/x-portable-bitmap - - - pcap - application/vnd.tcpdump.pcap - - - pcf - application/x-font-pcf - - - pcl - application/vnd.hp-pcl - - - pclxl - application/vnd.hp-pclxl - - - pct - image/pict - - - pcurl - application/vnd.curl.pcurl - - - pcx - image/x-pcx - - - pdb - application/vnd.palm - - - pdf - application/pdf - - - pfa - application/x-font-type1 - - - pfb - application/x-font-type1 - - - pfm - application/x-font-type1 - - - pfr - application/font-tdpfr - - - pfx - application/x-pkcs12 - - - pgm - image/x-portable-graymap - - - pgn - application/x-chess-pgn - - - pgp - application/pgp-encrypted - - - pic - image/pict - - - pict - image/pict - - - pkg - application/octet-stream - - - pki - application/pkixcmp - - - pkipath - application/pkix-pkipath - - - plb - application/vnd.3gpp.pic-bw-large - - - plc - application/vnd.mobius.plc - - - plf - application/vnd.pocketlearn - - - pls - audio/x-scpls - - - pml - application/vnd.ctc-posml - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - portpkg - application/vnd.macports.portpkg - - - pot - application/vnd.ms-powerpoint - - - potm - application/vnd.ms-powerpoint.template.macroenabled.12 - - - potx - application/vnd.openxmlformats-officedocument.presentationml.template - - - ppam - application/vnd.ms-powerpoint.addin.macroenabled.12 - - - ppd - application/vnd.cups-ppd - - - ppm - image/x-portable-pixmap - - - pps - application/vnd.ms-powerpoint - - - ppsm - application/vnd.ms-powerpoint.slideshow.macroenabled.12 - - - ppsx - application/vnd.openxmlformats-officedocument.presentationml.slideshow - - - ppt - application/vnd.ms-powerpoint - - - pptm - application/vnd.ms-powerpoint.presentation.macroenabled.12 - - - pptx - application/vnd.openxmlformats-officedocument.presentationml.presentation - - - pqa - application/vnd.palm - - - prc - application/x-mobipocket-ebook - - - pre - application/vnd.lotus-freelance - - - prf - application/pics-rules - - - ps - application/postscript - - - psb - application/vnd.3gpp.pic-bw-small - - - psd - image/vnd.adobe.photoshop - - - psf - application/x-font-linux-psf - - - pskcxml - application/pskc+xml - - - ptid - application/vnd.pvi.ptid1 - - - pub - application/x-mspublisher - - - pvb - application/vnd.3gpp.pic-bw-var - - - pwn - application/vnd.3m.post-it-notes - - - pya - audio/vnd.ms-playready.media.pya - - - pyv - video/vnd.ms-playready.media.pyv - - - qam - application/vnd.epson.quickanime - - - qbo - application/vnd.intu.qbo - - - qfx - application/vnd.intu.qfx - - - qps - application/vnd.publishare-delta-tree - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - qwd - application/vnd.quark.quarkxpress - - - qwt - application/vnd.quark.quarkxpress - - - qxb - application/vnd.quark.quarkxpress - - - qxd - application/vnd.quark.quarkxpress - - - qxl - application/vnd.quark.quarkxpress - - - qxt - application/vnd.quark.quarkxpress - - - ra - audio/x-pn-realaudio - - - ram - audio/x-pn-realaudio - - - rar - application/x-rar-compressed - - - ras - image/x-cmu-raster - - - rcprofile - application/vnd.ipunplugged.rcprofile - - - rdf - application/rdf+xml - - - rdz - application/vnd.data-vision.rdz - - - rep - application/vnd.businessobjects - - - res - application/x-dtbresource+xml - - - rgb - image/x-rgb - - - rif - application/reginfo+xml - - - rip - audio/vnd.rip - - - rl - application/resource-lists+xml - - - rlc - image/vnd.fujixerox.edmics-rlc - - - rld - application/resource-lists-diff+xml - - - rm - application/vnd.rn-realmedia - - - rmi - audio/midi - - - rmp - audio/x-pn-realaudio-plugin - - - rms - application/vnd.jcp.javame.midlet-rms - - - rnc - application/relax-ng-compact-syntax - - - roa - application/rpki-roa - - - roff - text/troff - - - rp9 - application/vnd.cloanto.rp9 - - - rpss - application/vnd.nokia.radio-presets - - - rpst - application/vnd.nokia.radio-preset - - - rq - application/sparql-query - - - rs - application/rls-services+xml - - - rsd - application/rsd+xml - - - rss - application/rss+xml - - - rtf - application/rtf - - - rtx - text/richtext - - - s - text/x-asm - - - saf - application/vnd.yamaha.smaf-audio - - - sbml - application/sbml+xml - - - sc - application/vnd.ibm.secure-container - - - scd - application/x-msschedule - - - scm - application/vnd.lotus-screencam - - - scq - application/scvp-cv-request - - - scs - application/scvp-cv-response - - - scurl - text/vnd.curl.scurl - - - sda - application/vnd.stardivision.draw - - - sdc - application/vnd.stardivision.calc - - - sdd - application/vnd.stardivision.impress - - - sdkd - application/vnd.solent.sdkm+xml - - - sdkm - application/vnd.solent.sdkm+xml - - - sdp - application/sdp - - - sdw - application/vnd.stardivision.writer - - - see - application/vnd.seemail - - - seed - application/vnd.fdsn.seed - - - sema - application/vnd.sema - - - semd - application/vnd.semd - - - semf - application/vnd.semf - - - ser - application/java-serialized-object - - - setpay - application/set-payment-initiation - - - setreg - application/set-registration-initiation - - - sfd-hdstx - application/vnd.hydrostatix.sof-data - - - sfs - application/vnd.spotfire.sfs - - - sgl - application/vnd.stardivision.writer-global - - - sgm - text/sgml - - - sgml - text/sgml - - - sh - application/x-sh - - - shar - application/x-shar - - - shf - application/shf+xml - - - - sig - application/pgp-signature - - - silo - model/mesh - - - sis - application/vnd.symbian.install - - - sisx - application/vnd.symbian.install - - - sit - application/x-stuffit - - - sitx - application/x-stuffitx - - - skd - application/vnd.koan - - - skm - application/vnd.koan - - - skp - application/vnd.koan - - - skt - application/vnd.koan - - - sldm - application/vnd.ms-powerpoint.slide.macroenabled.12 - - - sldx - application/vnd.openxmlformats-officedocument.presentationml.slide - - - slt - application/vnd.epson.salt - - - sm - application/vnd.stepmania.stepchart - - - smf - application/vnd.stardivision.math - - - smi - application/smil+xml - - - smil - application/smil+xml - - - smzip - application/vnd.stepmania.package - - - snd - audio/basic - - - snf - application/x-font-snf - - - so - application/octet-stream - - - spc - application/x-pkcs7-certificates - - - spf - application/vnd.yamaha.smaf-phrase - - - spl - application/x-futuresplash - - - spot - text/vnd.in3d.spot - - - spp - application/scvp-vp-response - - - spq - application/scvp-vp-request - - - spx - audio/ogg - - - src - application/x-wais-source - - - sru - application/sru+xml - - - srx - application/sparql-results+xml - - - sse - application/vnd.kodak-descriptor - - - ssf - application/vnd.epson.ssf - - - ssml - application/ssml+xml - - - st - application/vnd.sailingtracker.track - - - stc - application/vnd.sun.xml.calc.template - - - std - application/vnd.sun.xml.draw.template - - - stf - application/vnd.wt.stf - - - sti - application/vnd.sun.xml.impress.template - - - stk - application/hyperstudio - - - stl - application/vnd.ms-pki.stl - - - str - application/vnd.pg.format - - - stw - application/vnd.sun.xml.writer.template - - - sub - text/vnd.dvb.subtitle - - - sus - application/vnd.sus-calendar - - - susp - application/vnd.sus-calendar - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svc - application/vnd.dvb.service - - - svd - application/vnd.svd - - - svg - image/svg+xml - - - svgz - image/svg+xml - - - swa - application/x-director - - - swf - application/x-shockwave-flash - - - swi - application/vnd.aristanetworks.swi - - - sxc - application/vnd.sun.xml.calc - - - sxd - application/vnd.sun.xml.draw - - - sxg - application/vnd.sun.xml.writer.global - - - sxi - application/vnd.sun.xml.impress - - - sxm - application/vnd.sun.xml.math - - - sxw - application/vnd.sun.xml.writer - - - t - text/troff - - - taglet - application/vnd.mynfc - - - tao - application/vnd.tao.intent-module-archive - - - tar - application/x-tar - - - tcap - application/vnd.3gpp2.tcap - - - tcl - application/x-tcl - - - teacher - application/vnd.smart.teacher - - - tei - application/tei+xml - - - teicorpus - application/tei+xml - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - text - text/plain - - - tfi - application/thraud+xml - - - tfm - application/x-tex-tfm - - - thmx - application/vnd.ms-officetheme - - - tif - image/tiff - - - tiff - image/tiff - - - tmo - application/vnd.tmobile-livetv - - - torrent - application/x-bittorrent - - - tpl - application/vnd.groove-tool-template - - - tpt - application/vnd.trid.tpt - - - tr - text/troff - - - tra - application/vnd.trueapp - - - trm - application/x-msterminal - - - tsd - application/timestamped-data - - - tsv - text/tab-separated-values - - - ttc - application/x-font-ttf - - - ttf - application/x-font-ttf - - - ttl - text/turtle - - - twd - application/vnd.simtech-mindmapper - - - twds - application/vnd.simtech-mindmapper - - - txd - application/vnd.genomatix.tuxedo - - - txf - application/vnd.mobius.txf - - - txt - text/plain - - - u32 - application/x-authorware-bin - - - udeb - application/x-debian-package - - - ufd - application/vnd.ufdl - - - ufdl - application/vnd.ufdl - - - ulw - audio/basic - - - umj - application/vnd.umajin - - - unityweb - application/vnd.unity - - - uoml - application/vnd.uoml+xml - - - uri - text/uri-list - - - uris - text/uri-list - - - urls - text/uri-list - - - ustar - application/x-ustar - - - utz - application/vnd.uiq.theme - - - uu - text/x-uuencode - - - uva - audio/vnd.dece.audio - - - uvd - application/vnd.dece.data - - - uvf - application/vnd.dece.data - - - uvg - image/vnd.dece.graphic - - - uvh - video/vnd.dece.hd - - - uvi - image/vnd.dece.graphic - - - uvm - video/vnd.dece.mobile - - - uvp - video/vnd.dece.pd - - - uvs - video/vnd.dece.sd - - - uvt - application/vnd.dece.ttml+xml - - - uvu - video/vnd.uvvu.mp4 - - - uvv - video/vnd.dece.video - - - uvva - audio/vnd.dece.audio - - - uvvd - application/vnd.dece.data - - - uvvf - application/vnd.dece.data - - - uvvg - image/vnd.dece.graphic - - - uvvh - video/vnd.dece.hd - - - uvvi - image/vnd.dece.graphic - - - uvvm - video/vnd.dece.mobile - - - uvvp - video/vnd.dece.pd - - - uvvs - video/vnd.dece.sd - - - uvvt - application/vnd.dece.ttml+xml - - - uvvu - video/vnd.uvvu.mp4 - - - uvvv - video/vnd.dece.video - - - uvvx - application/vnd.dece.unspecified - - - uvvz - application/vnd.dece.zip - - - uvx - application/vnd.dece.unspecified - - - uvz - application/vnd.dece.zip - - - vcard - text/vcard - - - vcd - application/x-cdlink - - - vcf - text/x-vcard - - - vcg - application/vnd.groove-vcard - - - vcs - text/x-vcalendar - - - vcx - application/vnd.vcx - - - vis - application/vnd.visionary - - - viv - video/vnd.vivo - - - vor - application/vnd.stardivision.writer - - - vox - application/x-authorware-bin - - - vrml - model/vrml - - - vsd - application/vnd.visio - - - vsf - application/vnd.vsf - - - vss - application/vnd.visio - - - vst - application/vnd.visio - - - vsw - application/vnd.visio - - - vtu - model/vnd.vtu - - - vxml - application/voicexml+xml - - - w3d - application/x-director - - - wad - application/x-doom - - - wav - audio/x-wav - - - wax - audio/x-ms-wax - - - - wbmp - image/vnd.wap.wbmp - - - wbs - application/vnd.criticaltools.wbs+xml - - - wbxml - application/vnd.wap.wbxml - - - wcm - application/vnd.ms-works - - - wdb - application/vnd.ms-works - - - weba - audio/webm - - - webm - video/webm - - - webp - image/webp - - - wg - application/vnd.pmi.widget - - - wgt - application/widget - - - wks - application/vnd.ms-works - - - wm - video/x-ms-wm - - - wma - audio/x-ms-wma - - - wmd - application/x-ms-wmd - - - wmf - application/x-msmetafile - - - - wml - text/vnd.wap.wml - - - - wmlc - application/vnd.wap.wmlc - - - - wmls - text/vnd.wap.wmlscript - - - - wmlsc - application/vnd.wap.wmlscriptc - - - wmv - video/x-ms-wmv - - - wmx - video/x-ms-wmx - - - wmz - application/x-ms-wmz - - - woff - application/x-font-woff - - - wpd - application/vnd.wordperfect - - - wpl - application/vnd.ms-wpl - - - wps - application/vnd.ms-works - - - wqd - application/vnd.wqd - - - wri - application/x-mswrite - - - wrl - model/vrml - - - wsdl - application/wsdl+xml - - - wspolicy - application/wspolicy+xml - - - wtb - application/vnd.webturbo - - - wvx - video/x-ms-wvx - - - x32 - application/x-authorware-bin - - - x3d - application/vnd.hzn-3d-crossword - - - xap - application/x-silverlight-app - - - xar - application/vnd.xara - - - xbap - application/x-ms-xbap - - - xbd - application/vnd.fujixerox.docuworks.binder - - - xbm - image/x-xbitmap - - - xdf - application/xcap-diff+xml - - - xdm - application/vnd.syncml.dm+xml - - - xdp - application/vnd.adobe.xdp+xml - - - xdssc - application/dssc+xml - - - xdw - application/vnd.fujixerox.docuworks - - - xenc - application/xenc+xml - - - xer - application/patch-ops-error+xml - - - xfdf - application/vnd.adobe.xfdf - - - xfdl - application/vnd.xfdl - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xhvml - application/xv+xml - - - xif - image/vnd.xiff - - - xla - application/vnd.ms-excel - - - xlam - application/vnd.ms-excel.addin.macroenabled.12 - - - xlc - application/vnd.ms-excel - - - xlm - application/vnd.ms-excel - - - xls - application/vnd.ms-excel - - - xlsb - application/vnd.ms-excel.sheet.binary.macroenabled.12 - - - xlsm - application/vnd.ms-excel.sheet.macroenabled.12 - - - xlsx - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - - - xlt - application/vnd.ms-excel - - - xltm - application/vnd.ms-excel.template.macroenabled.12 - - - xltx - application/vnd.openxmlformats-officedocument.spreadsheetml.template - - - xlw - application/vnd.ms-excel - - - xml - application/xml - - - xo - application/vnd.olpc-sugar - - - xop - application/xop+xml - - - xpi - application/x-xpinstall - - - xpm - image/x-xpixmap - - - xpr - application/vnd.is-xpr - - - xps - application/vnd.ms-xpsdocument - - - xpw - application/vnd.intercon.formnet - - - xpx - application/vnd.intercon.formnet - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xsm - application/vnd.syncml+xml - - - xspf - application/xspf+xml - - - xul - application/vnd.mozilla.xul+xml - - - xvm - application/xv+xml - - - xvml - application/xv+xml - - - xwd - image/x-xwindowdump - - - xyz - chemical/x-xyz - - - yang - application/yang - - - yin - application/yin+xml - - - z - application/x-compress - - - Z - application/x-compress - - - zaz - application/vnd.zzazz.deck+xml - - - zip - application/zip - - - zir - application/vnd.zul - - - zirz - application/vnd.zul - - - zmm - application/vnd.handheld-entertainment+xml - - - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - diff --git a/wisdom_web/target/tomcat/logs/access_log.2019-04-28 b/wisdom_web/target/tomcat/logs/access_log.2019-04-28 deleted file mode 100644 index 9896400..0000000 --- a/wisdom_web/target/tomcat/logs/access_log.2019-04-28 +++ /dev/null @@ -1,2 +0,0 @@ -0:0:0:0:0:0:0:1 - - [28/Apr/2019:15:25:57 +0800] "GET / HTTP/1.1" 200 99 http-bio-8081-exec-1 927 -0:0:0:0:0:0:0:1 - - [28/Apr/2019:15:25:57 +0800] "GET /favicon.ico HTTP/1.1" 404 949 http-bio-8081-exec-3 18 diff --git a/wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.class b/wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.class deleted file mode 100644 index 7735222..0000000 Binary files a/wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.class and /dev/null differ diff --git a/wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java b/wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java deleted file mode 100644 index 79dbc41..0000000 --- a/wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Generated by the Jasper component of Apache Tomcat - * Version: Apache Tomcat/7.0.47 - * Generated at: 2019-04-28 07:25:56 UTC - * Note: The last modified time of this file was set to - * the last modified time of the source file after - * generation to assist with modification tracking. - */ -package org.apache.jsp; - -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.jsp.*; - -public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase - implements org.apache.jasper.runtime.JspSourceDependent { - - private static final javax.servlet.jsp.JspFactory _jspxFactory = - javax.servlet.jsp.JspFactory.getDefaultFactory(); - - private static java.util.Map _jspx_dependants; - - private javax.el.ExpressionFactory _el_expressionfactory; - private org.apache.tomcat.InstanceManager _jsp_instancemanager; - - public java.util.Map getDependants() { - return _jspx_dependants; - } - - public void _jspInit() { - _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory(); - _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig()); - } - - public void _jspDestroy() { - } - - public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response) - throws java.io.IOException, javax.servlet.ServletException { - - final javax.servlet.jsp.PageContext pageContext; - javax.servlet.http.HttpSession session = null; - final javax.servlet.ServletContext application; - final javax.servlet.ServletConfig config; - javax.servlet.jsp.JspWriter out = null; - final java.lang.Object page = this; - javax.servlet.jsp.JspWriter _jspx_out = null; - javax.servlet.jsp.PageContext _jspx_page_context = null; - - - try { - response.setContentType("text/html;charset=UTF-8"); - pageContext = _jspxFactory.getPageContext(this, request, response, - null, true, 8192, true); - _jspx_page_context = pageContext; - application = pageContext.getServletContext(); - config = pageContext.getServletConfig(); - session = pageContext.getSession(); - out = pageContext.getOut(); - _jspx_out = out; - - out.write("\r\n"); - out.write("\r\n"); - out.write("\r\n"); - out.write("\r\n"); - out.write(" Title\r\n"); - out.write("\r\n"); - out.write("\r\n"); - out.write("

web

\r\n"); - out.write("\r\n"); - out.write("\r\n"); - } catch (java.lang.Throwable t) { - if (!(t instanceof javax.servlet.jsp.SkipPageException)){ - out = _jspx_out; - if (out != null && out.getBufferSize() != 0) - try { out.clearBuffer(); } catch (java.io.IOException e) {} - if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); - else throw new ServletException(t); - } - } finally { - _jspxFactory.releasePageContext(_jspx_page_context); - } - } -} diff --git a/wisdom_web/target/wisdom_web.war b/wisdom_web/target/wisdom_web.war deleted file mode 100644 index 902e728..0000000 Binary files a/wisdom_web/target/wisdom_web.war and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/classes/com/smart/controller/test.class b/wisdom_web/target/wisdom_web/WEB-INF/classes/com/smart/controller/test.class deleted file mode 100644 index a8b9a81..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/classes/com/smart/controller/test.class and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/classes/log4j.properties b/wisdom_web/target/wisdom_web/WEB-INF/classes/log4j.properties deleted file mode 100644 index 3802802..0000000 --- a/wisdom_web/target/wisdom_web/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=WARN,A1 -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c]-[%p] %m%n \ No newline at end of file diff --git a/wisdom_web/target/wisdom_web/WEB-INF/classes/spring/springmvc.xml b/wisdom_web/target/wisdom_web/WEB-INF/classes/spring/springmvc.xml deleted file mode 100644 index 0cda8a4..0000000 --- a/wisdom_web/target/wisdom_web/WEB-INF/classes/spring/springmvc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/aspectjweaver-1.9.2.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/aspectjweaver-1.9.2.jar deleted file mode 100644 index ea0d8df..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/aspectjweaver-1.9.2.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/c3p0-0.9.1.1.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/c3p0-0.9.1.1.jar deleted file mode 100644 index 8d283e4..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/c3p0-0.9.1.1.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-codec-1.6.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-codec-1.6.jar deleted file mode 100644 index ee1bc49..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-codec-1.6.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-fileupload-1.3.1.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-fileupload-1.3.1.jar deleted file mode 100644 index af0cda2..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-fileupload-1.3.1.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-io-2.2.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-io-2.2.jar deleted file mode 100644 index 84ca565..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-io-2.2.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-lang3-3.3.2.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-lang3-3.3.2.jar deleted file mode 100644 index 2ce08ae..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-lang3-3.3.2.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-logging-1.1.3.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-logging-1.1.3.jar deleted file mode 100644 index ab51254..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-logging-1.1.3.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-net-3.3.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-net-3.3.jar deleted file mode 100644 index f4f19a9..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/commons-net-3.3.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/core-3.1.0.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/core-3.1.0.jar deleted file mode 100644 index 4af3020..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/core-3.1.0.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/dubbo-2.5.3.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/dubbo-2.5.3.jar deleted file mode 100644 index a77a7f3..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/dubbo-2.5.3.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/fastjson-1.2.57.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/fastjson-1.2.57.jar deleted file mode 100644 index 6171193..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/fastjson-1.2.57.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/httpclient-4.3.5.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/httpclient-4.3.5.jar deleted file mode 100644 index 1db1225..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/httpclient-4.3.5.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/httpcore-4.3.2.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/httpcore-4.3.2.jar deleted file mode 100644 index 813ec23..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/httpcore-4.3.2.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/javassist-3.15.0-GA.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/javassist-3.15.0-GA.jar deleted file mode 100644 index 5af8eae..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/javassist-3.15.0-GA.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/jline-0.9.94.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/jline-0.9.94.jar deleted file mode 100644 index dede372..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/jline-0.9.94.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/joda-time-2.5.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/joda-time-2.5.jar deleted file mode 100644 index 4fe151d..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/joda-time-2.5.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/jsqlparser-0.9.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/jsqlparser-0.9.jar deleted file mode 100644 index add444f..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/jsqlparser-0.9.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/jstl-1.2.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/jstl-1.2.jar deleted file mode 100644 index 0fd275e..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/jstl-1.2.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/log4j-1.2.16.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/log4j-1.2.16.jar deleted file mode 100644 index 5429a90..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/log4j-1.2.16.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/mybatis-3.4.6.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/mybatis-3.4.6.jar deleted file mode 100644 index ae6aae8..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/mybatis-3.4.6.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/netty-3.7.0.Final.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/netty-3.7.0.Final.jar deleted file mode 100644 index eef1aba..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/netty-3.7.0.Final.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/pagehelper-3.4.2-fix.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/pagehelper-3.4.2-fix.jar deleted file mode 100644 index fe886fe..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/pagehelper-3.4.2-fix.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/quartz-2.2.2.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/quartz-2.2.2.jar deleted file mode 100644 index bfff897..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/quartz-2.2.2.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/slf4j-api-1.6.1.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/slf4j-api-1.6.1.jar deleted file mode 100644 index f1f4fdd..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/slf4j-api-1.6.1.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/slf4j-log4j12-1.6.4.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/slf4j-log4j12-1.6.4.jar deleted file mode 100644 index 1517fbd..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/slf4j-log4j12-1.6.4.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar deleted file mode 100644 index 3e4c0eb..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-aop-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-aspects-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-aspects-5.1.5.RELEASE.jar deleted file mode 100644 index 13bde27..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-aspects-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar deleted file mode 100644 index f793dc8..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-beans-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar deleted file mode 100644 index 8253c22..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-context-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-context-support-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-context-support-5.1.5.RELEASE.jar deleted file mode 100644 index 1358db2..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-context-support-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar deleted file mode 100644 index 6f5056a..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-core-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar deleted file mode 100644 index 999540f..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-expression-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar deleted file mode 100644 index df14814..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jcl-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jdbc-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jdbc-5.1.5.RELEASE.jar deleted file mode 100644 index 3e42fef..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jdbc-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jms-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jms-5.1.5.RELEASE.jar deleted file mode 100644 index 17cc4b4..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-jms-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-messaging-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-messaging-5.1.5.RELEASE.jar deleted file mode 100644 index f206bbc..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-messaging-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-tx-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-tx-5.1.5.RELEASE.jar deleted file mode 100644 index 6ab7d77..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-tx-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar deleted file mode 100644 index b66ff17..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-web-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar deleted file mode 100644 index e760ae1..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/spring-webmvc-5.1.5.RELEASE.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar deleted file mode 100644 index c969ee6..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar deleted file mode 100644 index e864c41..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar deleted file mode 100644 index c652f61..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/zkclient-0.1.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/zkclient-0.1.jar deleted file mode 100644 index aebcc34..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/zkclient-0.1.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/lib/zookeeper-3.4.7.jar b/wisdom_web/target/wisdom_web/WEB-INF/lib/zookeeper-3.4.7.jar deleted file mode 100644 index dfcd074..0000000 Binary files a/wisdom_web/target/wisdom_web/WEB-INF/lib/zookeeper-3.4.7.jar and /dev/null differ diff --git a/wisdom_web/target/wisdom_web/WEB-INF/web.xml b/wisdom_web/target/wisdom_web/WEB-INF/web.xml deleted file mode 100644 index c607a67..0000000 --- a/wisdom_web/target/wisdom_web/WEB-INF/web.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - wisdom-manager-web - - - - CharacterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - utf-8 - - - - CharacterEncodingFilter - /* - - - - - - wisdom-manager-web - org.springframework.web.servlet.DispatcherServlet - - - contextConfigLocation - classpath:spring/springmvc.xml - - 1 - - - wisdom-manager-web - / - - - \ No newline at end of file diff --git a/wisdom_web/target/wisdom_web/index.jsp b/wisdom_web/target/wisdom_web/index.jsp deleted file mode 100644 index 7b5160b..0000000 --- a/wisdom_web/target/wisdom_web/index.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: 27548 - Date: 2019/4/23 - Time: 21:18 - To change this template use File | Settings | File Templates. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Title - - -

web

- - diff --git "a/\346\216\245\345\217\243API.md" "b/\346\216\245\345\217\243API.md" new file mode 100644 index 0000000..84a0466 --- /dev/null +++ "b/\346\216\245\345\217\243API.md" @@ -0,0 +1,877 @@ +后台API文档 +=========== +## 1.9后台版本更新 ++ 添加了教师3个方法 ++ 通过courseItem查询这整个一节课中所有学生的考勤信息 ++ 通过学生id和课程id查出这个学生整个学期的平均考勤统计 ++ 查询这个学生这个学期每一节这个课的考勤信息 +## 1.8后台版本更新 ++ 添加了 老师端，获取一段时间内有自己课程的每一天的整体考勤信息 ++ 修复了张聪说的00：00：00的问题 +## 1.7后台版本更新 ++ 修改了图片服务器端向服务器发送消息，app无法收到消息的bug ++ 修改了微信端获取学生个人信息错误的url ++ 添加了可以查询今天与昨天，本周与上周，本月与上月考勤状态变化的api +## 1.6后台版本更新 ++ 修复了教师端msg返回1的bug ++ _修复了教师端的返回值_ +## 1.5后台api版本更新 ++ 添加了图片服务器端给后台发送消息，app端接受消息的功能 +## 1.4后台api版本更新 ++ 查询开学到现在的每日统计考勤以及统计这段时间的统计考勤 添加了分页 ++ 修复了教室登陆返回1的bug ++ 修复了数据库无事务提交的bug ++ 修复了app端课程信息不显示的bug +---------- +## web或app端登陆 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/login/all + +### _需传输的参数_ +name|describe +----|------ +account|账号 +password|密码 +status|学生为1，老师为2 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|返回的消息信息 +data|查询到的学生信息对象，对应数据库中的tb_student的各个值 +### 返回值样本 +```json +学生账号密码正确情况: + { + "status": 1, + "msg": "true", + "data": { + "id": "41609050128", //学生id + "name": "宁大力", //学生姓名 + "sex": "male", //学生性别 + "phone": "", //学生电话号码 + "email": null, //学生邮箱 + "classId": "080902201601", //班级id + "className": "软件1班", //班级名称 + "professionId": "080902", //专业id + "professionName": "软件工程", //专业名称 + "collegeId": "06", //学院id + "collegeName": "计算机科学学院", //学院名称 + "weixinId": null //微信号 + } + } +老师账号和密码正确的情况 + { + "status": 2, + "msg": "true", + "data": { + "id": "1", //老师id + "name": "薛涛", //老师名字 + "sex": "male", //老师性别 + "college_id": "06", //老师学院id + "college_name": "计算机科学学院", //老师学院名称 + "picture": null, //照片 + "wexin_id": null, //微信id + "phone_code": null, //手机号 + "email": null, //电子邮箱 + "position_id": "01", //职位 + "position_name": "院长" //职称 + } + } +账号或密码错误情况: + {"status":0, + "msg":"账号或密码错误", + "data":null} + +``` +---- +## 微信小程序登陆 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/login/weixinLogin + +### _需传输的参数_ +name|describe +----|------ +appid|小程序id +secret|小程序的appSecret +js_code|登陆时获取的code +grant_type|授权类型，此处只需填写 authorization_code + +### _返回值_ +name|describe +----|------ +status|返回值状态 0--->未绑定 1--->学生 2--->老师 +msg|服务器去腾讯api中获取的openid +data|null +### 返回值样本 +```json +学生第一次登陆: + {"status":1, + "msg":获取到的openid, + "data":服务其所对应的session值 } +老师第一次登陆: + {"status":2, + "msg":获取到的openid, + "data":服务其所对应的session值} +该用户未绑定: + {"status":2, + "msg":获取到的openid, + "data":服务其所对应的session值} +``` +---- +## 微信小程序绑定用户与openid +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/wx1/bindOpenid + +### _需传输的参数_ +name|describe +----|------ +account|绑定的账号 +password|绑定的密码 +status|绑定人员的类型：1-->学生、2-->老师 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|成功或错误消息 +data|null +### 返回值样本 +```json +用户绑定的账号密码正确: + {"status":1, + "msg":"true", + "data": + { + "id": "41609050128", //学生id + "name": "宁大力", //姓名 + "sex": "male", //性别 + "phone": "", //电话号码 + "email": null, //电子邮箱 + "classId": "080902201601", //班级id + "className": "软件1班", //班级名称 + "professionId": "080902", //专业id + "professionName": "软件工程", //专业名称 + "collegeId": "06", //学院名称 + "collegeName": "计算机科学学院", 学院名称 + "weixinId": null} //微信号 +用户绑定的账号或密码错误: + {"status":0, + "msg":"账号或密码错误", + "data":null} +``` +---- +## 微信小程序获取学生的个人信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/weixin/getStudentInfo + +### _需传输的参数_ +name|describe +----|------ +无|无 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|成功或错误消息 +data|null +### 返回值样本 +```json +用户绑定的账号密码正确: + {"status":1, + "msg":"true", + "data": + { + "id": "41609050128", //学生id + "name": "宁大力", //姓名 + "sex": "male", //性别 + "phone": "", //电话号码 + "email": null, //电子邮箱 + "classId": "080902201601", //班级id + "className": "软件1班", //班级名称 + "professionId": "080902", //专业id + "professionName": "软件工程", //专业名称 + "collegeId": "06", //学院id + "collegeName": "计算机科学学院", //学院名称 + "weixinId": null} //微信号 +用户绑定的账号或密码错误: + {"status":0, + "msg":"账号或密码错误", + "data":null} +``` +---- +## 查询本周的课程信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/thisWeek + +### _需传输的参数_ +name|describe +----|------ +无|无 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 （目前没有查不出来的情况） +msg|true +data|（List集合）课程的信息，该节课老师的信息，该节课的时间地点 +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": [ + { + "id": "20190503081000", //这节课的id + "time": 1556842200000, //上课时间 + "courseId": "1008", //课程id + "courseName": "企业管理与技术经济",//课程名称 + "courseNote": null,//课程备注 + "attendanceTotalScore": 60,//考勤总分 + "leaveScore": 20,//请假分数 + "attendScore": 20,//出席分数 + "lateAttendScore": 10,//迟到分数 + "headUpScore": 40,//抬头总分 + "classroomId": "B135",//教室id + "teacherId": "15",//教师id + "teacherName": "龚东生"//教师姓名 + }, + { + "id": "20190503081000", + "time": 1556842200000, + "courseId": "1008", + "courseName": "企业管理与技术经济", + "courseNote": null, + "attendanceTotalScore": 60, + "leaveScore": 20, + "attendScore": 20, + "lateAttendScore": 10, + "headUpScore": 40, + "classroomId": "B135", + "teacherId": "15", + "teacherName": "龚东生" + } + ] +} +``` +### _类似请求，返回值类似_ +name|method|url|requestParams|describe +----|------|---|----|-------- +查询本月的课程信息|post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/thisMonth|无|无 +查询一段时间内的课程信息|post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/getASpellTime|begin-->开始时间 end-->结束时间|无 +查询相对于本周而言，前x周的考勤 |post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/frontXWeek|n-->前n周|无 +查询相对于本月而言，前n月的课程信息 |post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/frontXMonth|n-->前n月|无 +查询本学期第x个月的课程信息|post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/xMonth|n-->第n月|无 +查询本学期第x个周的课程信息|post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/xWeek|n-->第n月|无 +查询固定一天的课程信息|post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/oneday|dateTime-->某天的日期|无 +查询本学期所有的课程信息|post|http://47.103.14.73:8080/wisdom_web/studentCourseInfo/thisSemester|无|无 +---- +## 查询某一段时间的考勤信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getCourseOfStudentWithSpellTime +api说明|该为每节课的考勤信息+每节课的详细信息包括打分情况 +### _需传输的参数_ +name|describe +----|------ +start|开始时间 2019-03-04 00:00:00 +end|结束时间 2019-05-11 00:00:00 +courseId|课程id 1004 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 （目前没有查不出来的情况） +msg|true +data|（List集合）课程考勤信息 +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": [ + { + "attendance_id": "20190401081000-41609050128",//考勤id + "courseitem_id": "20190401081000",//考勤的那节课的id + "name": "算法设计与分析",//那节课的课程名 + "time": "2019-04-01 08:10:00.0",//上课时间 + "status": "attend",//到勤状态 + "head_up_rate": "1",//抬头率 + "goal": "60",//考勤得分 + "teacher_id": "12",//老师id + "teacher_name": "李婷",//老师姓名 + "classroom_id": "D3102",//教室id + "course_node": null,//课程备注 + "student_id": null,//学生id + "student_name": null//学生姓名 + }, + { + "attendance_id": "20190405101000-41609050128", + "courseitem_id": "20190405101000", + "name": "算法设计与分析", + "time": "2019-04-05 10:10:00.0", + "status": "attend", + "head_up_rate": "1", + "goal": "60", + "teacher_id": "12", + "teacher_name": "李婷", + "classroom_id": "C354", + "course_node": null, + "student_id": null, + "student_name": null + } + ] +} +``` +### _类似请求，返回值类似_ +name|method|url|requestParams|describe +----|------|---|----|-------- +查询某段时间的具体某一节课的课程信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getCourseOfStudentWithSpellTime|start-->开始时间 end-->结束时间 courseId-->课程id|通过传输来的课程id，与起始时间计算出该学生这段时间内该课程的考勤信息 +查询本周某一节课的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/oneCourseAttThisWeek|courseId-->课程id|无 +查询上一周某一节课的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/oneCourseAttLastWeek|courseId-->课程id|无 +查询本月某一节课的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/oneCourseAttThisMonth|courseId-->课程id|无 +查询上一月某一节课的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/oneCourseAttLastMonth|courseId-->课程id|无 +查询这个学期的某一节课的课程信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/oneCourseAttThisSemester|courseId-->课程id|无 +---- +## 查询该学生一段时间内的所有课程的考勤信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/studetnAttendance/allCourseAttASpellTime +api说明|该为每节课的考勤信息 +### _需传输的参数_ +name|describe +----|------ +start|开始时间 2019-03-04 00:00:00 +end|结束时间 2019-05-11 00:00:00 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 （目前5月份的数据没插，查不出来） +msg|true +data|（List集合）课程考勤信息 +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": [ + { + "attendance_id": "20190401081000-41609050128",//考勤的id + "courseitem_id": "20190401081000",//这节课的id + "name": "算法设计与分析",//这节课的课程名 + "time": "2019-04-01 08:10:00.0",//上课时间 + "status": "attend",//道勤状态 + "head_up_rate": "1",//抬头率 + "goal": "60",//考勤得分 + "teacher_id": "12",//教师id + "teacher_name": "李婷",//教师姓名 + "classroom_id": "D3102",//教室id + "course_node": null,//课程备注 + "student_id": null,//学生id + "student_name": null//学生名称 + }, + { + "attendance_id": "20190401101000-41609050128", + "courseitem_id": "20190401101000", + "name": "信息安全技术", + "time": "2019-04-01 10:10:00.0", + "status": "attend", + "head_up_rate": "1", + "goal": "60", + "teacher_id": "13", + "teacher_name": "陈亮", + "classroom_id": "D3102", + "course_node": null, + "student_id": null, + "student_name": null + } + ] +} + +``` +### _类似请求，返回值类似_ +name|method|url|requestParams|describe +----|------|---|----|-------- +查询该学生开学到现在内的所有课程的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/allCourseAttThisSemester|无|无 +查询该学生本周内的所有课程的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/allCourseAttThisWeek|无|无 +查询该学生上周内的所有课程的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/allCourseAttLastWeek|无|无 +查询该学生本月内的所有课程的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/allCourseAttThisMonth|无|无 +查询该学生上月内的所有课程的考勤信息|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/allCourseAttLastMonth|无|无 +---- +## 学生查询自己的每天的考勤平均分，平均抬头，有几节课，率等（以下统称为每日统计考勤） +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfST +api说明|查询一段时间内的每日统计考勤，以及所有天的平均值 +### _需传输的参数_ +name|describe +----|------ +start|开始时间 2019-03-04 00:00:00 +end|结束时间 2019-05-11 00:00:00 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 （目前5月份的数据没插，查不出来） +msg|true +data|这段时间的每日统计考勤的集合 +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": { + "startTime": null,--->开始时间 + "endTime": null,--->结束时间 + "num": 3,--->一共多少天的考勤，就是结束时间与开始时间中间有多少天 + "headUpRateAverage": "0.55",--->num天的平均抬头率 + "list": [--->每一个小集合是每一天的统计考勤 + { + "date": "2019-04-01",--->当天日期 + "sum": "2",--->有几节课 + "avg_head_up_rate": "1",--->这一天的抬头率 + "avgGoal": "60.0000"--->这一天的平均分 + }, + { + "date": "2019-04-02", + "sum": "3", + "avg_head_up_rate": "1", + "avgGoal": "60.0000" + }, + { + "date": "2019-04-03", + "sum": "1", + "avg_head_up_rate": "1", + "avgGoal": "60.0000" + } + ], + "attendanceGoalAverage": "33.10"--->num天的平均考勤分数 + } +} +``` +### _类似请求，返回值类似_ +name|method|url|requestParams|describe +----|------|---|----|-------- +查询本周的每日统计考勤以及统计这段时间的统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfTW|无|无 +查询上周的每日统计考勤以及统计这段时间的统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfLW|无|无 +查询本月的每日统计考勤以及统计这段时间的统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfTM|无|无 +查询上月的每日统计考勤以及统计这段时间的统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfLM|无|无 +查询某天的每日统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfOD|oneday-->某一天的时间(2018-05-12 00:00:00)|无 +查询今天的每日统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfT|无|无 +查询开学到现在的每日统计考勤以及统计这段时间的统计考勤|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/getProAttOfTS|page-->第几页（没有该参数默认为第1页）size-->页面几行信息（默认15）|可以使用分页 +---- +## 给某个固定的学生发响应的信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/monitorStudent/setStudentStatus +api说明|给服务器发送一个消息加入到消息队列里面 +### _需传输的参数_ +name|describe +----|------ +msg|要发送的消息 +id|要给哪一个学生发送消息 +status|状态值 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|true +data| +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": {} + +} +``` +---- +## 给某个固定的学生发响应的信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/monitorStudent/getStudentMsg +api说明|获取服务器消息队列中某个学生的消息 +### _需传输的参数_ +name|describe +----|------ +id|学生的id + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|true +data|具体的消息 +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": { + "id": "41609050201",--->该学生的学号 + "status": "1",--->状态值 + "msg": null--->消息字段 + } +} +``` +---- +---- +## 获取今天与昨天的考勤变化 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/studetnAttendance/yesAndTodayDiff +api说明|获取今天与昨天的考勤、抬头流程分数之差 +### _需传输的参数_ +name|describe +----|------ +无|无 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|true +data|具体的消息 +### 返回值样本 +```json +{ + "status": 1, + "msg": "true", + "data": { + "thisGrade": "\ufffd",//本月、本周、本日的考勤分数 + "thisHeadup": "\ufffd",//本月、本周、本日的抬头率 + "attDiff": "0.0",//考勤分数的增长和下降 + "headupDiff": "0.0"//抬头率的增长和下降 + } +} +``` +### _类似请求，返回值类似_ +name|method|url|requestParams|describe +----|------|---|----|-------- +获取今天与昨天的考勤变化|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/lastAndThisWeekDiff|无|无 +获取今天与昨天的考勤变化|post|http://47.103.14.73:8080/wisdom_web/studetnAttendance/lastAndThisMonthDiff|无|无 + +---- +## 老师端，获取一段时间内有自己课程的每一天的整体考勤信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getAttOfClassAtASpellTime +api说明|获取一段时间内有自己上的课程的每一天的整体考勤信息 +### _需传输的参数_ +name|describe +----|------ +start|开始时间 2019-05-05 00:00:00 +end|结束时间 2019-05-19 00:00:00 +status|请求参数值 6 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 2--->没有课程 0--->失败 +msg|true +data|具体的消息 +### 返回值样本 +```json +有课的情况: +{ + "status": 1,--->返回状态值 + "msg": "true",--->消息 + "data": [--->链表 + { + "checkAttendanceList": [--->这一天中该该老师的课程列表 + { + "courseitem_id": "20190507100000",--->这节课的id号 + "number": 78,--->这节课应该到的人数 + "avg_goal": "57.3333",--->这节课班级总人获得的平均考勤分 + "avg_head_up_rate": "0.583846153846154",--->这节课的平均抬头率 + "avg_headup_score": "40.0000",--->这节课的平均抬头率 + "absent_num": 1,--->缺勤人数 + "sleep_num": 4,--->睡觉任谁 + "create_date": "2019-05-07 10:00:00.0"--->上课时间 + }, + { + "courseitem_id": "20190507100000",--->这节课的id号 + "number": 78,--->这节课应该到的人数 + "avg_goal": "57.3333",--->这节课班级总人获得的平均考勤分 + "avg_head_up_rate": "0.583846153846154",--->这节课的平均抬头率 + "avg_headup_score": "40.0000",--->这节课的平均抬头率 + "absent_num": 1,--->缺勤人数 + "sleep_num": 4,--->睡觉任谁 + "create_date": "2019-05-07 10:00:00.0"--->上课时间 + } + ], + "date": "2019-05-07",--->这一天的日期 + "headcount": 78,--->这个你们不用管 + "sleepNum": 4,--->睡觉的人数 + "absentNum": 1,--->缺勤人数 + "sleepRate": 0.0513,--->睡觉百分比 + "sbsentRate": 0.0128,--->缺勤率 + "attGoalAve": 57.3333,--->平均考勤分 + "headupGoalAue": 40,--->平均抬头分数 + "headUpAve": 0.5838,--->平均抬头率 + "toOftenRate": 0.9872--->平均道清率 + }, + { + "checkAttendanceList": [ + { + "courseitem_id": "20190510100000", + "number": 78, + "avg_goal": "57.3333", + "avg_head_up_rate": "0.583846153846154", + "avg_headup_score": "40.0000", + "absent_num": 1, + "sleep_num": 5, + "create_date": "2019-05-10 10:00:00.0" + } + ], + "date": "2019-05-10", + "headcount": 78, + "sleepNum": 5, + "absentNum": 1, + "sleepRate": 0.0641, + "sbsentRate": 0.0128, + "attGoalAve": 57.3333, + "headupGoalAue": 40, + "headUpAve": 0.5838, + "toOftenRate": 0.9872 + }, + { + "checkAttendanceList": [ + { + "courseitem_id": "20190514100000", + "number": 78, + "avg_goal": "57.3333", + "avg_head_up_rate": "0.583846153846154", + "avg_headup_score": "40.0000", + "absent_num": 2, + "sleep_num": 3, + "create_date": "2019-05-14 10:00:00.0" + } + ], + "date": "2019-05-14", + "headcount": 78, + "sleepNum": 3, + "absentNum": 2, + "sleepRate": 0.0385, + "sbsentRate": 0.0256, + "attGoalAve": 57.3333, + "headupGoalAue": 40, + "headUpAve": 0.5838, + "toOftenRate": 0.9744 + } +``` +### _类似请求，返回值类似_ +name|method|url|requestParams|describe +----|------|---|----|-------- +获取今天老师上了那些课，返回考勤信息|post|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getAttOfClassAtASpellTime|satus--->1|无 +获取这周老师上了那些课，返回考勤信息|post|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getAttOfClassAtASpellTime|satus--->2|无 +获取这月老师上了那些课，返回考勤信息|post|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getAttOfClassAtASpellTime|satus--->3|无 +获取这学期老师上了那些课，返回考勤信息|post|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getAttOfClassAtASpellTime|satus--->4|无 +获取某一天老师上了那些课，返回考勤信息|post|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getAttOfClassAtASpellTime|satus--->5,start--->某一天时间|无 +---- +## 通过courseItem查询这整个一节课中所有学生的考勤信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getStudentAttWithCourseItem +api说明|通过courseItem查询这整个一节课中所有学生的考勤信息 +### _需传输的参数_ +name|describe +----|------ +courseItemId|这一门课的唯一的一个id 确定的一节课的id + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|true +data|具体的消息 +### 返回值样本 +```json +{ + + "status": 1,--->状态码 + "msg": "true",--->消息 + "data": [--->每个同学的这节课信息 + { + "attendance_id": "20190531100000-111",--->这个人的考勤id + "courseitem_id": "20190531100000",--->这节课的id + "student_id": "111",--->学生id + "student_name": "刘景亮",--->学生名字 + "create_date": "2019-05-31 10:00:00.0",--->这节课开始时间 + "status": "attend",--->到勤状态，具体的看数据库表有哪几个 + "head_up_rate": "0.68",--->这节课的抬头率 + "headup_score": "40",--->这节课抬头分数 + "goal": "60",--->这节课的考勤总分说 + "sleep": "0"--->这节课睡觉没 + }, + { + "attendance_id": "20190531100000-333", + "courseitem_id": "20190531100000", + "student_id": "333", + "student_name": "石万虎", + "create_date": "2019-05-31 10:00:00.0", + "status": "attend", + "head_up_rate": "0.32", + "headup_score": "40", + "goal": "50", + "sleep": "0" + }, + { + "attendance_id": "20190531100000-41509050106", + "courseitem_id": "20190531100000", + "student_id": "41509050106", + "student_name": "胡淩斌", + "create_date": "2019-05-31 10:00:00.0", + "status": "attend", + "head_up_rate": "0.33", + "headup_score": "40", + "goal": "51", + "sleep": "0" + }, + { + "attendance_id": "20190531100000-41509050216", + "courseitem_id": "20190531100000", + "student_id": "41509050216", + "student_name": "王坤", + "create_date": "2019-05-31 10:00:00.0", + "status": "attend", + "head_up_rate": "0.69", + "headup_score": "40", + "goal": "60", + "sleep": "0" + } +} +``` +---- +## 老师端，通过学生id和课程id查出这个学生整个学期的平均考勤统计 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getStudentAttInCourse +api说明|通过学生id和课程id查出这个学生整个学期的平均考勤统计 +### _需传输的参数_ +name|describe|测试参数 +----|------|---- +studentId|学生id|41609050128 +courseId|课程id|1004 + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|true +data|具体的消息 +### 返回值样本 +```json + { + "status": 1,--->状态码 + "msg": "true",--->消息 + "data": {--->数据 + "student_id": "41609050128",--->学生id + "name": "宁大力",--->学生姓名 + "course_id": "1004",--->该门课的id + "course_name": "算法设计与分析",--->该门课的名字 + "total": "2",--->上了几节课 + "leave_num": "0",--->请假次数 + "late_num": "0",--->迟到次数 + "absent_num": "0",--->缺勤次数 + "attend_num": "2",--->道勤次数 + "sleep_num": "0",--->睡觉次数 + "avg_head_up_rate": "1",--->平均抬头率 + "avg_headup_score": "40.0000",--->平均抬头率得分 + "avg_goal": "60.0000"--->这学期的平均课堂分数 + } + } +``` +---- +## 老师端，查询这个学生这个学期每一节这个课的考勤信息 +### _请求方式与url_ +name|describe +----|------ +method|post +url|http://47.103.14.73:8080/wisdom_web/teacherAttendance/getStudentAttInEveryCourse +api说明|查询这个学生这个学期每一节这个课的考勤信息 +### _需传输的参数_ +name|describe|测试参数 +----|------|---- +studentId|学生id|41609050128 +courseId|课程id|1004 + + +### _返回值_ +name|describe +----|------ +status|返回值状态 1--->成功 0--->失败 +msg|true +data|具体的消息 +### 返回值样本 +```json +{ + "status": 1,--->状态吗 + "msg": "true",--->消息 + "data": [--->这个学生在这个课上每一节课的考勤信息 + { + "attendance_id": null,--->无 + "courseitem_id": null,--->无 + "student_id": "41609050128",--->学生id + "student_name": "宁大力",--->学生姓名 + "create_date": null,--->这节课的时间 + "status": "attend",--->这节课的状态 + "head_up_rate": "1",--->抬头率 + "headup_score": "40",--->抬头所得分数 + "goal": "60",--->这节课的考勤总分 + "sleep": "0"--->是否睡觉 + }, + { + "attendance_id": null, + "courseitem_id": null, + "student_id": "41609050128", + "student_name": "宁大力", + "create_date": null, + "status": "attend", + "head_up_rate": "1", + "headup_score": "40", + "goal": "60", + "sleep": "0" + } + ] +} +``` +---- \ No newline at end of file