Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
3f8fe1b
已经将登陆api写好
May 1, 2019
6f52d2b
把学生和老师的登陆API写好了
May 3, 2019
2ea3b25
出出现了一个问 题,按照网上的方法做了一下
May 3, 2019
049e0ed
把学生和老师的登陆API写好了
May 3, 2019
a2e90d6
准备让刘梦写mapper
May 4, 2019
2dc61bc
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 5, 2019
67c9b5e
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 5, 2019
99dc19e
Revert "准备让刘梦写mapper"
LM123Code May 5, 2019
d7ccc7d
在TbStudentMapper里增加selectWCourseInfo接口
LM123Code May 5, 2019
71b1bde
修改pom文件
LM123Code May 5, 2019
cfd25d5
添加ignore
LM123Code May 5, 2019
300c709
修改好了,已经可以网页登陆+查询课程(初步)
May 5, 2019
79a12e2
把所有要push的东西push了
May 5, 2019
c3055b8
last
LM123Code May 5, 2019
a2f8296
修改了xml里查询WCourseitem的语句
LM123Code May 6, 2019
00aa4b9
把所有要push的东西push了
May 6, 2019
321018d
修改了xml里查询WCourseitem的语句
LM123Code May 6, 2019
6c5eb0e
出错了,混滚回去
LM123Code May 6, 2019
8d5be7d
错的
LM123Code May 6, 2019
f834189
错的
LM123Code May 6, 2019
60ab28b
更改方法里的属性映射关系
LM123Code May 6, 2019
8ce2d3c
Revert "准备让刘梦写mapper"
LM123Code May 6, 2019
3dc1f33
随便commit一个
May 6, 2019
ece3bd3
5月6日晚留念
May 6, 2019
f70ea8c
将学生课程查询完成了
May 7, 2019
79d55de
微信登陆ok,可以进行微信端与后台的交互
May 7, 2019
44648a8
微信端的登陆以及绑定也写完了
May 8, 2019
18415f4
把target文件和ã€.idea文件都消除了
May 8, 2019
e6800b5
测试了微信端的俩个接口,一个登陆,一个绑定openid
May 8, 2019
0c47f75
调整了一下bug,使发布的war包可以进行跨域访问
May 10, 2019
ab36dbd
添加方法
LM123Code May 10, 2019
f99cffd
添加方法并修改pojo
LM123Code May 11, 2019
1bf0a3f
修改了学生.xml的相关错误
LM123Code May 11, 2019
50d5580
发现joda-time不可以进行序列化,不能再dubbo中进行传输,进行修改将dateTime都换成了string,之后再转换成string
May 11, 2019
f472d9b
解决了dubbo的以来冲突问题,将dateTime重新转化了一下
May 11, 2019
a58cd5d
添加了查询一段时间某个学生某一个课的考勤的接口,以及添加了微信小程序获取个人信息的接口
May 12, 2019
ea4371d
修改了一处bug以及更换了服务器
May 12, 2019
d7d3135
每个controller都加了跨域的注解
May 14, 2019
e449b52
添加了selectDaysAttendanceCollectByIDStartEnd方法,查询一段时间内每天的考勤汇总
LM123Code May 14, 2019
89842ed
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 14, 2019
c3a1262
修改了数据库的tb_attendance、tb_answer_question表结构
LM123Code May 14, 2019
24566bb
添加课程id属性
LM123Code May 14, 2019
53d741f
添加查询个人StageAttendanceCollect方法
LM123Code May 14, 2019
7fb84a9
添加方法queryStageAttendanceCollectByCourseIdStartEnd查询某课程的考勤汇总
LM123Code May 14, 2019
9a0ae07
查询一节课任何时间的考勤信息,查询一段时间所有的考勤信息
May 14, 2019
49be821
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 14, 2019
027ce67
修改方法selectDaysAttendanceCollectByIDStartEnd,为相关pojo添加属性avg_head_up_rate
LM123Code May 15, 2019
10bcc61
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 15, 2019
0572707
添加了查询一段时间中每一天的考勤大致情况的api+总计
May 15, 2019
7c27631
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 15, 2019
8e05ec4
修改学生端三种登陆方法,添加查询头像功能,为相关pojo添加picture(头像url)属性
LM123Code May 15, 2019
8358d0b
修改了api文档
May 15, 2019
db9db76
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 15, 2019
cd50ed3
修改无法映射course_node的bug
LM123Code May 15, 2019
5c78b7e
更新1.4版本,修复bug
May 16, 2019
7749fd0
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 16, 2019
9bcf5fa
更新了一下api文档
May 16, 2019
6359c59
selectDaysAttendanceCollectByIDStartEnd方法结果排序
LM123Code May 16, 2019
456b33f
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 16, 2019
b3c5f49
修正了WCourseInfo对象查询时courseNode属性映射的问题
LM123Code May 16, 2019
cc40a82
添加了一个接受罗少淇那边服务器请求的接口
May 16, 2019
d0db67c
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 16, 2019
642b750
实现了消息的接受以及app端消息的获取
May 16, 2019
0e8f9f3
添加了平均抬头分数
LM123Code May 16, 2019
fe03d3a
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 16, 2019
06ca3bd
添加了平均抬头分数
LM123Code May 16, 2019
8bd3106
api更新
LM123Code May 16, 2019
9a33605
修复了教师端的登陆返回值的bug
May 17, 2019
2b1ce36
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 17, 2019
8a63741
修改了老师登陆后返回的信息
May 17, 2019
d6253fd
修改了数据库表tb_answer_question结构
LM123Code May 18, 2019
1a83f7d
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 18, 2019
f87b9b5
编写了留言系统中的留言部分
May 18, 2019
0b8f2bb
查询一段时间或某节课的某种状态的人{id,姓名,班级,考勤时间,考勤的那节课的id}
LM123Code May 18, 2019
2f93c8f
1.7版本的改进
May 18, 2019
59cdc6e
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 18, 2019
9ca0e3e
去掉00:00:00:00
LM123Code May 19, 2019
0f957e9
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 19, 2019
cf0318a
方法:查看今天有几节课+平均考勤总分+平均抬头率+缺勤人数+睡觉人数
LM123Code May 19, 2019
e7d52ce
写几个接口
May 19, 2019
a76c591
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 19, 2019
eb3a72c
补充上次的缺漏
LM123Code May 19, 2019
9562502
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 19, 2019
fd9ecc8
错误修正
LM123Code May 19, 2019
79f55fb
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 19, 2019
9116fc0
添加number(人数)属性
LM123Code May 19, 2019
c6cb0b5
添加平均抬头分数属性
LM123Code May 19, 2019
a997266
写了个分装类
May 19, 2019
df949d0
写了个分装类
May 19, 2019
fc2177a
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 19, 2019
c11df90
实现了可以进行查询老师某一天课程信息,以及这一天的课程信息的大概信息
May 19, 2019
0670f51
StudentMapper 添加了3个方法
LM123Code May 19, 2019
87aef7e
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 19, 2019
06b1ca3
1.8版本更新
May 19, 2019
47b7d99
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 19, 2019
70067b4
1.9更新
May 19, 2019
3cfc010
添加了/**
LM123Code May 19, 2019
ff817c8
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
May 19, 2019
41d8d0c
1.9更新
May 19, 2019
687baa7
添加时间的查询
LM123Code May 19, 2019
c8f37c9
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 19, 2019
dd79ec7
给张聪修改了一下pojo
May 19, 2019
558da1d
为queryCheckAttendance方法返回对象添加course_name属性
LM123Code May 20, 2019
4b35f01
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
LM123Code May 20, 2019
f73d5ad
给张聪修改了一下pojo
MrDalili May 25, 2019
444b166
Merge branch 'dubug_web' of https://github.com/xpuintelligence/Intell…
MrDalili May 25, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
52 changes: 45 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
<mybatis.paginator.version>1.2.15</mybatis.paginator.version>
<mysql.version>5.1.32</mysql.version>
<slf4j.version>1.6.4</slf4j.version>
<fastjson.version>1.2.57</fastjson.version>
<!--<fastjson.version>1.2.58</fastjson.version>-->
<jackson.version>2.9.8</jackson.version>
<druid.version>1.0.9</druid.version>
<httpclient.version>4.3.5</httpclient.version>
<jstl.version>1.2</jstl.version>
Expand All @@ -43,10 +44,31 @@
<activemq.version>5.13.0</activemq.version>
<freemarker.version>2.3.23</freemarker.version>
<quartz.version>2.2.2</quartz.version>
<lombok.version>1.16.6</lombok.version>
<okhttp.version>3.14.1</okhttp.version>
<javassist-version>3.18.2-GA</javassist-version>
<springtx.version>5.1.6.RELEASE</springtx.version>
</properties>

<dependencyManagement>
<dependencies>
<!--<dependency>-->
<!--<groupId>com.alibaba</groupId>-->
<!--<artifactId>fastjson</artifactId>-->
<!--<version>${jackson.version}</version>-->
<!--</dependency>-->
<!--http请求-->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<!-- 时间操作组件 -->
<dependency>
<groupId>joda-time</groupId>
Expand All @@ -70,11 +92,13 @@
<version>${commons-net.version}</version>
</dependency>
<!-- fastjson 处理工具包 -->
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -92,7 +116,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- 日志处理 -->
<dependency>
Expand All @@ -113,7 +136,7 @@
</dependency>
<dependency>
<groupId>com.github.miemiedev</groupId>
<artifactId>mybatis-paginator</artifactId>
<artifactId>mybatis-paginator</artifactId>
<version>${mybatis.paginator.version}</version>
</dependency>
<dependency>
Expand All @@ -134,12 +157,16 @@
<version>${druid.version}</version>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${springtx.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
Expand Down Expand Up @@ -211,6 +238,17 @@
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<version>${dubbo.version}</version>
<exclusions>
<exclusion>
<artifactId>javassist</artifactId>
<groupId>org.javassist</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist-version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
Expand Down
20 changes: 14 additions & 6 deletions wisdom_common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
<artifactId>wisdom_common</artifactId>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- 时间操作组件 -->
<dependency>
<groupId>joda-time</groupId>
Expand All @@ -30,11 +38,6 @@
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</dependency>
<!-- fastjson Json处理工具包 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<!-- httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -49,7 +52,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- 日志处理 -->
<dependency>
Expand All @@ -61,6 +63,12 @@
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.57</version>
<scope>compile</scope>
</dependency>
</dependencies>

</project>
16 changes: 16 additions & 0 deletions wisdom_common/src/main/java/com/smart/pojo/AttDiff.java
Original file line number Diff line number Diff line change
@@ -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;//抬头率不一样
}
Original file line number Diff line number Diff line change
@@ -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;//睡觉状态
}
29 changes: 29 additions & 0 deletions wisdom_common/src/main/java/com/smart/pojo/AttendanceItem.java
Original file line number Diff line number Diff line change
@@ -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;//学生名
}
Original file line number Diff line number Diff line change
@@ -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;//考勤的那节课
}
23 changes: 23 additions & 0 deletions wisdom_common/src/main/java/com/smart/pojo/CheckAttendance.java
Original file line number Diff line number Diff line change
@@ -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;//这节课上课时间
}
Original file line number Diff line number Diff line change
@@ -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<CheckAttendance> 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<CheckAttendance> 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));
}
}
Original file line number Diff line number Diff line change
@@ -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;//平均总分
}
Loading