Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
M
master-5.0
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
master-5.0
Commits
27153e05
提交
27153e05
authored
11月 12, 2019
作者:
malei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(statistics): statistics
1.分析模块移植 References: N/A
上级
ac1dffd6
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
344 行增加
和
9 行删除
+344
-9
WebLogClient.java
...c/main/java/com/zrqx/core/client/weblog/WebLogClient.java
+2
-2
WebLogHystric.java
.../main/java/com/zrqx/core/client/weblog/WebLogHystric.java
+2
-2
WebLogAspect.java
.../main/java/com/zrqx/core/commons/aspect/WebLogAspect.java
+3
-3
ExamRecordInfo.java
...ommons/model/resource/questionlibrary/ExamRecordInfo.java
+79
-0
StudyRecordInfo.java
...mmons/model/resource/questionlibrary/StudyRecordInfo.java
+78
-0
ResponseCodeEnum.java
core/src/main/java/com/zrqx/core/enums/ResponseCodeEnum.java
+9
-1
QueryTimeUnitEnum.java
...ava/com/zrqx/core/enums/statistics/QueryTimeUnitEnum.java
+31
-0
QuestionTypeEnum.java
...java/com/zrqx/core/enums/statistics/QuestionTypeEnum.java
+134
-0
CallBack.java
core/src/main/java/com/zrqx/core/util/response/CallBack.java
+6
-1
没有找到文件。
core/src/main/java/com/zrqx/core/client/weblog/
Sysuser
Client.java
→
core/src/main/java/com/zrqx/core/client/weblog/
WebLog
Client.java
浏览文件 @
27153e05
...
@@ -9,8 +9,8 @@ import com.zrqx.core.util.response.CallBack;
...
@@ -9,8 +9,8 @@ import com.zrqx.core.util.response.CallBack;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
@FeignClient
(
value
=
"sysuser"
,
fallback
=
Sysuer
Hystric
.
class
)
@FeignClient
(
value
=
"sysuser"
,
fallback
=
WebLog
Hystric
.
class
)
public
interface
Sysuser
Client
{
public
interface
WebLog
Client
{
@ApiOperation
(
value
=
"保存日志"
,
notes
=
"/save"
)
@ApiOperation
(
value
=
"保存日志"
,
notes
=
"/save"
)
@PostMapping
(
"/bg/log/save"
)
@PostMapping
(
"/bg/log/save"
)
...
...
core/src/main/java/com/zrqx/core/client/weblog/
Sysuer
Hystric.java
→
core/src/main/java/com/zrqx/core/client/weblog/
WebLog
Hystric.java
浏览文件 @
27153e05
...
@@ -8,9 +8,9 @@ import com.zrqx.core.commons.model.sysuser.Log;
...
@@ -8,9 +8,9 @@ import com.zrqx.core.commons.model.sysuser.Log;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.util.response.CallBack
;
@Component
@Component
public
class
SysuerHystric
implements
Sysuser
Client
{
public
class
WebLogHystric
implements
WebLog
Client
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
Sysuer
Hystric
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
WebLog
Hystric
.
class
);
@Override
@Override
public
CallBack
<
Boolean
>
saveLog
(
Log
log
)
{
public
CallBack
<
Boolean
>
saveLog
(
Log
log
)
{
...
...
core/src/main/java/com/zrqx/core/commons/aspect/WebLogAspect.java
浏览文件 @
27153e05
...
@@ -9,7 +9,7 @@ import java.util.Map;
...
@@ -9,7 +9,7 @@ import java.util.Map;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
com.zrqx.core.client.weblog.
Sysuser
Client
;
import
com.zrqx.core.client.weblog.
WebLog
Client
;
import
com.zrqx.core.commons.model.sysuser.Log
;
import
com.zrqx.core.commons.model.sysuser.Log
;
import
com.zrqx.core.commons.redis.Redis
;
import
com.zrqx.core.commons.redis.Redis
;
import
com.zrqx.core.util.log.LogUtils
;
import
com.zrqx.core.util.log.LogUtils
;
...
@@ -39,7 +39,7 @@ public class WebLogAspect {
...
@@ -39,7 +39,7 @@ public class WebLogAspect {
private
Redis
redis
;
private
Redis
redis
;
@Autowired
@Autowired
private
SysuserClient
sysuser
Client
;
private
WebLogClient
webLog
Client
;
/**
/**
...
@@ -57,7 +57,7 @@ public class WebLogAspect {
...
@@ -57,7 +57,7 @@ public class WebLogAspect {
//构建log
//构建log
Log
log
=
LogUtils
.
getLog
(
joinPoint
,
apiOperation
,
this
.
getClass
(),
redis
.
getUser
().
getUserName
(),
IPUtil
.
getIpAddr
(
request
));
Log
log
=
LogUtils
.
getLog
(
joinPoint
,
apiOperation
,
this
.
getClass
(),
redis
.
getUser
().
getUserName
(),
IPUtil
.
getIpAddr
(
request
));
sysuser
Client
.
saveLog
(
log
);
webLog
Client
.
saveLog
(
log
);
return
log
.
getResult
();
return
log
.
getResult
();
}
}
...
...
core/src/main/java/com/zrqx/core/commons/model/resource/questionlibrary/ExamRecordInfo.java
0 → 100644
浏览文件 @
27153e05
package
com
.
zrqx
.
core
.
commons
.
model
.
resource
.
questionlibrary
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
java.util.Date
;
/**
* 考试记录详细 ExamRecordInfo entity. @author MyEclipse Persistence Tools
*/
@Data
@ApiModel
(
value
=
"ExamRecordInfo"
,
description
=
"考试记录详细"
)
@Table
(
name
=
"res_examrecordinfo"
)
public
class
ExamRecordInfo
implements
java
.
io
.
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
6565591180614931677L
;
@Id
@GeneratedValue
(
generator
=
"JDBC"
)
@ApiModelProperty
(
"考试记录详细id"
)
private
Integer
id
;
@ApiModelProperty
(
"所属考试记录id"
)
private
Integer
recordid
;
@ApiModelProperty
(
"试卷详细id"
)
private
String
exampaperinfoid
;
@ApiModelProperty
(
"父级试卷详细id"
)
private
String
parentexaminfoid
;
@ApiModelProperty
(
"试题类型"
)
private
Integer
questionType
;
@ApiModelProperty
(
"试题标题"
)
private
String
title
;
@ApiModelProperty
(
"试题内容"
)
private
String
content
;
@ApiModelProperty
(
"答案a"
)
private
String
answer1
;
@ApiModelProperty
(
"答案b"
)
private
String
answer2
;
@ApiModelProperty
(
"答案c"
)
private
String
answer3
;
@ApiModelProperty
(
"答案d"
)
private
String
answer4
;
@ApiModelProperty
(
"答案e"
)
private
String
answer5
;
@ApiModelProperty
(
"答案f"
)
private
String
answer6
;
@ApiModelProperty
(
"考生答案"
)
private
String
stuanswer
;
@ApiModelProperty
(
"正确答案"
)
private
String
rightanswer
;
@ApiModelProperty
(
"试题解析"
)
private
String
analysis
;
@ApiModelProperty
(
"试题分数"
)
private
Integer
score
;
@ApiModelProperty
(
"题号"
)
private
Integer
sort
;
@ApiModelProperty
(
"是否答对0 错误1正确"
)
private
Integer
isRight
;
@ApiModelProperty
(
"考生得分"
)
private
Integer
stuscore
;
@ApiModelProperty
(
"用户id"
)
private
String
review
;
@ApiModelProperty
(
"教师id"
)
private
String
teacerId
;
// 教师id
@ApiModelProperty
(
"批阅时间"
)
private
Date
readtime
;
// 批阅时间
@ApiModelProperty
(
"年份"
)
private
String
years
;
@ApiModelProperty
(
"试题id"
)
private
Integer
questionId
;
}
\ No newline at end of file
core/src/main/java/com/zrqx/core/commons/model/resource/questionlibrary/StudyRecordInfo.java
0 → 100644
浏览文件 @
27153e05
package
com
.
zrqx
.
core
.
commons
.
model
.
resource
.
questionlibrary
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
java.util.Date
;
/**
* 学习记录详细 ExamRecordInfo entity. @author MyEclipse Persistence Tools
*/
@Data
@ApiModel
(
value
=
"StudyRecordInfo"
,
description
=
"学习记录详细"
)
@Table
(
name
=
"res_study_recordinfo"
)
public
class
StudyRecordInfo
implements
java
.
io
.
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
-
2154445576144552950L
;
@Id
@GeneratedValue
(
generator
=
"JDBC"
)
@ApiModelProperty
(
"学习记录详细id"
)
private
Integer
id
;
@ApiModelProperty
(
"所属考试记录id"
)
private
String
recordid
;
@ApiModelProperty
(
"试卷详细id"
)
private
String
exampaperinfoid
;
@ApiModelProperty
(
"父级试卷详细id"
)
private
String
parentexaminfoid
;
@ApiModelProperty
(
"试题类型"
)
private
String
questionType
;
@ApiModelProperty
(
"试题标题"
)
private
String
title
;
@ApiModelProperty
(
"试题内容"
)
private
String
content
;
@ApiModelProperty
(
"答案a"
)
private
String
answer1
;
@ApiModelProperty
(
"答案b"
)
private
String
answer2
;
@ApiModelProperty
(
"答案c"
)
private
String
answer3
;
@ApiModelProperty
(
"答案d"
)
private
String
answer4
;
@ApiModelProperty
(
"答案e"
)
private
String
answer5
;
@ApiModelProperty
(
"答案f"
)
private
String
answer6
;
@ApiModelProperty
(
"考生答案"
)
private
String
stuanswer
;
@ApiModelProperty
(
"正确答案"
)
private
String
rightanswer
;
@ApiModelProperty
(
"试题解析"
)
private
String
analysis
;
@ApiModelProperty
(
"试题分数"
)
private
Integer
score
;
@ApiModelProperty
(
"题号"
)
private
Integer
sort
;
@ApiModelProperty
(
"是否答对0 错误1正确"
)
private
Integer
isRight
;
@ApiModelProperty
(
"考生得分"
)
private
Integer
stuscore
;
@ApiModelProperty
(
"教师评语(论述题)"
)
private
String
review
;
@ApiModelProperty
(
"教师id"
)
private
String
teacerId
;
// 教师id
@ApiModelProperty
(
"批阅时间"
)
private
Date
readtime
;
// 批阅时间
@ApiModelProperty
(
"年份"
)
private
String
years
;
@ApiModelProperty
(
"试题id"
)
private
Integer
questionId
;
}
\ No newline at end of file
core/src/main/java/com/zrqx/core/enums/ResponseCodeEnum.java
浏览文件 @
27153e05
...
@@ -17,7 +17,15 @@ public enum ResponseCodeEnum {
...
@@ -17,7 +17,15 @@ public enum ResponseCodeEnum {
/** 500,服务器异常" */
/** 500,服务器异常" */
EXCEPTION
(
500
,
"服务器异常"
),
EXCEPTION
(
500
,
"服务器异常"
),
/** 600, BaseException */
/** 600, BaseException */
BASE_EXCEPTION
(
600
,
"BaseException"
);
BASE_EXCEPTION
(
600
,
"BaseException"
),
/** -2,验证不通过" */
VALIDATE
(-
2
,
"验证不通过"
),
/** -4 接口调用 参数类型转换异常*/
BIND_EXCEPTION
(-
4
,
"参数不合法"
),
/** -5 接口调用缺少必填参数 */
MISS_EXCEPTION
(-
5
,
"缺少必填参数"
),
/** -6 登录过期或未登录 */
NO_LOGIN
(-
6
,
"请重新登录"
);
private
final
int
code
;
private
final
int
code
;
private
final
String
msg
;
private
final
String
msg
;
private
ResponseCodeEnum
(
int
code
,
String
msg
)
{
private
ResponseCodeEnum
(
int
code
,
String
msg
)
{
...
...
core/src/main/java/com/zrqx/core/enums/statistics/QueryTimeUnitEnum.java
0 → 100644
浏览文件 @
27153e05
package
com
.
zrqx
.
core
.
enums
.
statistics
;
/**
*
* ClassName: QueryTimeUnitEnum
* @Description: TODO
* @author lizhuo
* @date 2019年1月29日
*/
public
enum
QueryTimeUnitEnum
{
DAY
(
1
,
"日"
),
WEEK
(
2
,
"周"
),
MONTH
(
3
,
"月"
),
YEAR
(
4
,
"年"
);
//状态码
private
final
int
value
;
private
final
String
value_zh
;
private
QueryTimeUnitEnum
(
int
value
,
String
value_zh
)
{
this
.
value
=
value
;
this
.
value_zh
=
value_zh
;
}
public
int
getValue
()
{
return
value
;
}
public
String
getValue_zh
()
{
return
value_zh
;
}
}
core/src/main/java/com/zrqx/core/enums/statistics/QuestionTypeEnum.java
0 → 100644
浏览文件 @
27153e05
package
com
.
zrqx
.
core
.
enums
.
statistics
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
/**
* 试题类型
* @author ydm
* @date 2019年3月17日下午9:26:42
*/
public
enum
QuestionTypeEnum
{
TYPE_1
(
1
,
"单选"
),
TYPE_2
(
2
,
"多选"
),
TYPE_3
(
3
,
"判断"
),
TYPE_4
(
4
,
"填空"
),
TYPE_5
(
5
,
"简答"
),
TYPE_6
(
6
,
"案例"
);
private
final
Integer
code
;
private
final
String
name
;
private
QuestionTypeEnum
(
Integer
code
,
String
name
){
this
.
code
=
code
;
this
.
name
=
name
;
}
/**
* 获取测试需要的试题类型
* @return
*/
public
static
List
<
QuestionTypeEnum
>
getExamType
(){
List
<
QuestionTypeEnum
>
list
=
new
ArrayList
<
QuestionTypeEnum
>();
list
.
add
(
TYPE_1
);
list
.
add
(
TYPE_2
);
list
.
add
(
TYPE_3
);
list
.
add
(
TYPE_4
);
return
list
;
}
public
static
QuestionTypeEnum
valueOfCode
(
Integer
code
)
{
if
(
code
==
null
)
{
throw
new
IllegalArgumentException
(
"Question Type "
+
code
+
" is blank"
);
}
for
(
QuestionTypeEnum
mt
:
values
())
{
if
(
mt
.
getCode
().
equals
(
code
))
{
return
mt
;
}
}
throw
new
IllegalArgumentException
(
"Question Type "
+
code
+
" is not exist"
);
}
/**
* 通过ID获取中文名称
* @param code
* @return
*/
public
static
String
getName
(
Integer
code
)
{
if
(
code
==
null
)
{
return
null
;
}
for
(
QuestionTypeEnum
mt
:
values
())
{
if
(
mt
.
getCode
().
equals
(
code
))
{
return
mt
.
getName
();
}
}
return
null
;
}
/**
* 通过中文名称获取ID
* @param code
* @return
*/
public
static
Integer
getCode
(
String
name
)
{
if
(
StringUtils
.
isBlank
(
name
))
{
return
null
;
}
for
(
QuestionTypeEnum
mt
:
values
())
{
if
(
mt
.
getName
().
equals
(
name
))
{
return
mt
.
getCode
();
}
}
return
null
;
}
/**
* 通过ID获取中文名称
* @param code
* @return
*/
public
static
boolean
isExists
(
Integer
code
)
{
if
(
code
==
null
)
{
return
false
;
}
for
(
QuestionTypeEnum
mt
:
values
())
{
if
(
mt
.
getCode
().
equals
(
code
))
{
return
true
;
}
}
return
false
;
}
/**
* 获取所有的枚举,以MAP返回
* @return
*/
public
static
HashMap
<
Integer
,
String
>
getAllEnumMap
()
{
HashMap
<
Integer
,
String
>
map
=
new
HashMap
<
Integer
,
String
>();
for
(
QuestionTypeEnum
mt
:
values
())
{
map
.
put
(
mt
.
getCode
(),
mt
.
getName
());
}
return
map
;
}
public
Integer
getCode
()
{
return
code
;
}
public
String
getName
()
{
return
name
;
}
}
core/src/main/java/com/zrqx/core/util/response/CallBack.java
浏览文件 @
27153e05
...
@@ -139,5 +139,10 @@ public class CallBack<T> implements Serializable {
...
@@ -139,5 +139,10 @@ public class CallBack<T> implements Serializable {
this
.
data
=
data
;
this
.
data
=
data
;
}
}
public
static
<
T
>
CallBack
<
T
>
validate
(
T
data
)
{
return
create
(
ResponseCodeEnum
.
VALIDATE
,
data
);
}
public
static
<
T
>
CallBack
<
T
>
validate
()
{
return
fail
(
null
);
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论