Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
R
rtjl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
rtjl
Commits
4063587e
提交
4063587e
authored
12月 04, 2019
作者:
liupengfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
7dd68e30
显示空白字符变更
内嵌
并排
正在显示
18 个修改的文件
包含
761 行增加
和
2 行删除
+761
-2
QueryLibraryForm.java
...x/resource/commons/form/bg/resource/QueryLibraryForm.java
+20
-0
SaveLibraryForm.java
...qx/resource/commons/form/bg/resource/SaveLibraryForm.java
+29
-0
BgExamRecordStatisticsVo.java
...mmons/vo/bg/questionlibrary/BgExamRecordStatisticsVo.java
+71
-0
BgMemberExInfoVo.java
...ource/commons/vo/bg/questionlibrary/BgMemberExInfoVo.java
+63
-0
BgMemberStatisticsVo.java
...e/commons/vo/bg/questionlibrary/BgMemberStatisticsVo.java
+23
-0
BgQuestionCorrectVo.java
...ce/commons/vo/bg/questionlibrary/BgQuestionCorrectVo.java
+44
-0
BgQuestionLibraryVo.java
...ce/commons/vo/bg/questionlibrary/BgQuestionLibraryVo.java
+77
-0
BgQuestionTypeNameVo.java
...e/commons/vo/bg/questionlibrary/BgQuestionTypeNameVo.java
+13
-0
BgStudyRecordInfoVo.java
...ce/commons/vo/bg/questionlibrary/BgStudyRecordInfoVo.java
+70
-0
BgStudyRecordVo.java
...source/commons/vo/bg/questionlibrary/BgStudyRecordVo.java
+49
-0
BgSuggestVo.java
...x/resource/commons/vo/bg/questionlibrary/BgSuggestVo.java
+25
-0
ExcelQuestionVO.java
...source/commons/vo/bg/questionlibrary/ExcelQuestionVO.java
+56
-0
ExportVo.java
...zrqx/resource/commons/vo/bg/questionlibrary/ExportVo.java
+27
-0
HotPointVo.java
...qx/resource/commons/vo/bg/questionlibrary/HotPointVo.java
+11
-0
KeyValueVo.java
...qx/resource/commons/vo/bg/questionlibrary/KeyValueVo.java
+15
-0
FgAcupointLibraryController.java
...ntroller/acupointlibrary/FgAcupointLibraryController.java
+2
-1
FgResourceLibraryController.java
...ntroller/resourcelibrary/FgResourceLibraryController.java
+163
-0
FgResourceRelationService.java
...m/zrqx/resource/fg/service/FgResourceRelationService.java
+3
-1
没有找到文件。
app/resource/src/main/java/com/zrqx/resource/commons/form/bg/resource/QueryLibraryForm.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
form
.
bg
.
resource
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"QueryLibraryForm"
,
description
=
"查询资源"
)
public
class
QueryLibraryForm
{
@ApiModelProperty
(
value
=
"标题"
)
private
String
name
;
@ApiModelProperty
(
"自定义分类code"
)
private
String
diyTypeCode
;
@ApiModelProperty
(
"资源类型 1时辰库,2经络库,3穴位库,4视频库"
)
private
Integer
resourceType
;
@ApiModelProperty
(
value
=
"当前资源id(关联资源接口使用)"
)
private
String
id
;
@ApiModelProperty
(
value
=
"当前资源类型(关联资源接口使用)"
)
private
Integer
type
;
}
app/resource/src/main/java/com/zrqx/resource/commons/form/bg/resource/SaveLibraryForm.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
form
.
bg
.
resource
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"SaveLibraryForm"
,
description
=
"关联资源新增(视频、音频、pdf、图片、课件)"
)
public
class
SaveLibraryForm
{
@ApiModelProperty
(
"资源原始名称"
)
private
String
name
;
@ApiModelProperty
(
"资源标识code"
)
private
String
resourceCode
;
@ApiModelProperty
(
"资源类型 1 图书 3文章 61视频 62音频 63图片 64课件 65期刊 66pdf"
)
private
Integer
resourceType
;
@ApiModelProperty
(
"民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族"
)
private
Integer
nationsType
;
@ApiModelProperty
(
"来源"
)
private
String
source
;
@ApiModelProperty
(
"关键词"
)
private
String
keywords
;
@ApiModelProperty
(
"时长(视频、音频)"
)
private
String
timeLength
;
@ApiModelProperty
(
"文件大小(视频、音频)"
)
private
String
size
;
@ApiModelProperty
(
"作者"
)
private
String
author
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgExamRecordStatisticsVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
@Data
public
class
BgExamRecordStatisticsVo
{
@ApiModelProperty
(
"记录id"
)
private
Integer
id
;
@ApiModelProperty
(
"试卷id"
)
private
Integer
exampaperid
;
@ApiModelProperty
(
"试卷名称"
)
private
String
name
;
@ApiModelProperty
(
"答题开始时间"
)
private
String
begintime
;
@ApiModelProperty
(
"答题结束时间"
)
private
String
endtime
;
@ApiModelProperty
(
"测试时间"
)
private
Integer
readtime
;
@ApiModelProperty
(
"教师点评"
)
private
String
review
;
@ApiModelProperty
(
"试卷总分"
)
private
Integer
sumscore
;
@ApiModelProperty
(
"实际得分"
)
private
Integer
realscore
;
@ApiModelProperty
(
"总题数"
)
private
Integer
questionnum
;
@ApiModelProperty
(
"正确题数"
)
private
Integer
rightnum
;
@ApiModelProperty
(
"正确率"
)
private
String
precisionpercent
;
@ApiModelProperty
(
"所属学生"
)
private
String
stuId
;
@ApiModelProperty
(
"批次号"
)
private
String
batchCode
;
@ApiModelProperty
(
"当前科室code"
)
private
String
categorycode
;
@ApiModelProperty
(
"考试分类"
)
private
String
examcategory
;
@ApiModelProperty
(
"教师id"
)
private
String
teacherId
;
@ApiModelProperty
(
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
"真实姓名"
)
private
String
realName
;
@ApiModelProperty
(
"年龄范围"
)
private
Integer
ageArea
;
@ApiModelProperty
(
"单位级别 1部级 2地区"
)
private
Integer
unitLevel
;
@ApiModelProperty
(
"单位名称"
)
private
String
unitName
;
@ApiModelProperty
(
"邀请码"
)
private
String
code
;
@ApiModelProperty
(
"省"
)
private
String
province
;
@ApiModelProperty
(
"市"
)
private
String
city
;
@ApiModelProperty
(
"区县"
)
private
String
area
;
@ApiModelProperty
(
"乡镇"
)
private
String
town
;
@ApiModelProperty
(
"属性 手机号"
)
private
String
reserve1
;
@ApiModelProperty
(
"学习时长"
)
private
Integer
time
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgMemberExInfoVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
/**
* 用户补全信息
*/
@Data
public
class
BgMemberExInfoVo
implements
java
.
io
.
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1847688403515174892L
;
@ApiModelProperty
(
"会员id"
)
private
String
id
;
@ApiModelProperty
(
"真实姓名"
)
private
String
realName
;
@ApiModelProperty
(
"年龄范围"
)
private
Integer
ageArea
;
@ApiModelProperty
(
"年龄范围中文"
)
private
String
ageAreaZh
;
@ApiModelProperty
(
"单位级别"
)
private
Integer
unitLevel
;
@ApiModelProperty
(
"单位名称"
)
private
String
unitName
;
@ApiModelProperty
(
"邀请码"
)
private
String
code
;
@ApiModelProperty
(
"省"
)
private
String
province
;
@ApiModelProperty
(
"市"
)
private
String
city
;
@ApiModelProperty
(
"区县"
)
private
String
area
;
@ApiModelProperty
(
"乡镇"
)
private
String
town
;
@ApiModelProperty
(
"属性 手机号"
)
private
String
reserve1
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve2
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve3
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve4
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve5
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve6
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve7
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve8
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve9
;
@ApiModelProperty
(
"属性 使用后必须修改"
)
private
String
reserve10
;
@ApiModelProperty
(
"创建时间"
)
private
Date
createTime
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgMemberStatisticsVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.HashMap
;
import
java.util.List
;
@Data
public
class
BgMemberStatisticsVo
{
@ApiModelProperty
(
"注册人数"
)
private
String
memberSum
;
@ApiModelProperty
(
"年龄段:人数"
)
private
List
<
KeyValueVo
>
list
;
@ApiModelProperty
(
"年龄段值和文字说明的对比"
)
private
HashMap
<
Integer
,
String
>
map
;
@ApiModelProperty
(
"年龄段list"
)
private
List
<
String
>
ageList
;
@ApiModelProperty
(
"数据list"
)
private
List
<
String
>
dataList
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgQuestionCorrectVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.persistence.Id
;
import
java.util.Date
;
@Data
public
class
BgQuestionCorrectVo
{
@Id
@ApiModelProperty
(
value
=
"纠错表id"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"资源标题"
)
private
String
title
;
@ApiModelProperty
(
value
=
"纠错人姓名"
)
private
String
name
;
@ApiModelProperty
(
value
=
"纠错人"
)
private
String
creater
;
@ApiModelProperty
(
value
=
"资源类型:1电子书,2文章,3视频 4试题"
)
private
Integer
type
;
@ApiModelProperty
(
value
=
"错误类型 1题干有误2答案有误3解析有误"
)
private
Integer
correctType
;
@ApiModelProperty
(
value
=
"状态:0未审核,1已审核,2已纠错"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"纠错内容"
)
private
String
content
;
@ApiModelProperty
(
value
=
"纠错对象id"
)
private
String
objectId
;
@ApiModelProperty
(
value
=
"提交时间"
)
private
Date
commitTime
;
@JsonIgnore
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
@JsonIgnore
@ApiModelProperty
(
value
=
"更新时间"
)
private
Date
updateTime
;
@ApiModelProperty
(
"试题信息"
)
private
BgQuestionLibraryVo
ql
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgQuestionLibraryVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
com.zrqx.core.enums.statistics.QuestionTypeEnum
;
import
com.zrqx.resource.commons.model.questionlibrary.QuestionLibraryDiyType
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
@Data
public
class
BgQuestionLibraryVo
{
@ApiModelProperty
(
"试题id,新增时不需要填写"
)
private
Integer
id
;
@ApiModelProperty
(
"父级id"
)
private
Integer
parentid
;
@ApiModelProperty
(
"试题类型"
)
private
Integer
questionType
;
@ApiModelProperty
(
"考试类型"
)
private
String
examncategory
;
@ApiModelProperty
(
"学科分类code"
)
private
String
categorycode
;
@ApiModelProperty
(
"难易程度"
)
private
String
complexity
;
@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
rightanswer
;
@ApiModelProperty
(
"试题解析"
)
private
String
analysis
;
@ApiModelProperty
(
"题库类型0 系统试题 1上传试题"
)
private
Integer
databaseType
;
@ApiModelProperty
(
"创建人id"
)
private
String
creater
;
@ApiModelProperty
(
"创建人名称"
)
private
String
createrName
;
@ApiModelProperty
(
"试题状态"
)
private
Integer
publishStatus
;
@ApiModelProperty
(
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
"所属机构"
)
private
String
organizationid
;
@ApiModelProperty
(
"使用次数"
)
private
Integer
numberofuse
;
@ApiModelProperty
(
"答题次数"
)
private
Integer
numberofanswer
;
@ApiModelProperty
(
"正确次数"
)
private
Integer
numberofright
;
@ApiModelProperty
(
"小题题号"
)
private
Integer
childsort
;
@ApiModelProperty
(
"年份"
)
private
String
years
;
@ApiModelProperty
(
"试题分数"
)
private
BigDecimal
score
;
@ApiModelProperty
(
"试题关联分类"
)
List
<
QuestionLibraryDiyType
>
typeList
;
@ApiModelProperty
(
"试题类型"
)
private
Map
<
Integer
,
String
>
questionTypeMap
=
QuestionTypeEnum
.
getAllEnumMap
();
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgQuestionTypeNameVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
BgQuestionTypeNameVo
{
@ApiModelProperty
(
"试题类型"
)
private
String
type
;
@ApiModelProperty
(
"试题类型中文"
)
private
String
name
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgStudyRecordInfoVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
/**
* 学习记录详细 ExamRecordInfo entity. @author MyEclipse Persistence Tools
*/
@Data
@ApiModel
(
value
=
"StudyRecordInfo"
,
description
=
"学习记录详细"
)
public
class
BgStudyRecordInfoVo
implements
java
.
io
.
Serializable
{
@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
;
@ApiModelProperty
(
"是否收藏 1是0否"
)
private
Integer
isCollect
=
0
;
}
\ No newline at end of file
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgStudyRecordVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* 后台学习分析列表vo
* @author ydm
*
*/
@Data
public
class
BgStudyRecordVo
{
@ApiModelProperty
(
"省份"
)
private
String
province
;
@ApiModelProperty
(
"城市"
)
private
String
city
;
@ApiModelProperty
(
"学习/答题人次数"
)
private
String
num
;
@ApiModelProperty
(
"占比"
)
private
String
percent
;
@ApiModelProperty
(
"答题人数"
)
private
String
examSum
;
@ApiModelProperty
(
"答题人数占比"
)
private
String
examSumPercent
;
@ApiModelProperty
(
"100-80人数"
)
private
String
_100_80Sum
;
@ApiModelProperty
(
"79-60人数"
)
private
String
_79_60Sum
;
@ApiModelProperty
(
"59人数"
)
private
String
_59Sum
;
@ApiModelProperty
(
"准确率"
)
private
String
accuracy
;
@ApiModelProperty
(
"平均答题次数"
)
private
String
avg_exam_question
;
@ApiModelProperty
(
"平均答题时间"
)
private
String
avg_exam_time
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/BgSuggestVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
@Data
public
class
BgSuggestVo
{
@ApiModelProperty
(
"id"
)
private
Integer
id
;
@ApiModelProperty
(
"标题"
)
private
String
title
;
@ApiModelProperty
(
"创建人"
)
private
String
creater
;
@ApiModelProperty
(
"真实"
)
private
String
realName
;
@ApiModelProperty
(
"单位名称"
)
private
String
unitName
;
@ApiModelProperty
(
"提交时间"
)
private
Date
createTime
;
@ApiModelProperty
(
"内容"
)
private
String
content
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/ExcelQuestionVO.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
com.zrqx.core.util.excelutil.ExcelResources
;
import
com.zrqx.core.util.excelutil.ExcelSheetParams
;
import
lombok.Data
;
/**
* 试题导入导出
*
*/
@ExcelSheetParams
(
startRow
=
2
)
@Data
public
class
ExcelQuestionVO
{
@ExcelResources
(
title
=
"试题题干\n(必填)"
,
order
=
1
)
private
String
content
;
@ExcelResources
(
title
=
"选项A"
,
order
=
2
)
private
String
answerA
;
@ExcelResources
(
title
=
"选项B"
,
order
=
3
)
private
String
answerB
;
@ExcelResources
(
title
=
"选项C"
,
order
=
4
)
private
String
answerC
;
@ExcelResources
(
title
=
"选项D"
,
order
=
5
)
private
String
answerD
;
@ExcelResources
(
title
=
"选项E"
,
order
=
6
)
private
String
answerE
;
@ExcelResources
(
title
=
"选项F"
,
order
=
7
)
private
String
answerF
;
@ExcelResources
(
title
=
"正确答案\n(必填)"
,
order
=
8
)
private
String
rightAnswer
;
@ExcelResources
(
title
=
"试题解析"
,
order
=
9
)
private
String
analysis
;
@ExcelResources
(
title
=
"试题类型\n(必填)"
,
order
=
10
)
private
String
type
;
@ExcelResources
(
title
=
"难易程度"
,
order
=
11
)
private
String
complexity
;
@ExcelResources
(
title
=
"分值"
,
order
=
12
)
private
String
score
;
@ExcelResources
(
title
=
"业务类型\n(必填)"
,
order
=
13
)
private
String
diyType
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/ExportVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
io.swagger.annotations.ApiModel
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"ExportVo"
,
description
=
"导出数据Vo"
)
public
class
ExportVo
{
private
String
field1
;
private
String
field2
;
private
String
field3
;
private
String
field4
;
private
String
field5
;
private
String
field6
;
private
String
field7
;
private
String
field8
;
private
String
field9
;
private
String
field10
;
private
String
field11
;
private
String
field12
;
private
String
field13
;
private
String
field14
;
private
String
field15
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/HotPointVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
lombok.Data
;
@Data
public
class
HotPointVo
{
private
String
name
;
private
String
value
;
private
String
percent
;
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/questionlibrary/KeyValueVo.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
.
questionlibrary
;
import
lombok.Data
;
/**
* 用来获取键值对类型数据的vo
* @author ydm
*
*/
@Data
public
class
KeyValueVo
{
private
String
keyParam
;
private
String
valueParam
;
}
app/resource/src/main/java/com/zrqx/resource/fg/controller/acupointlibrary/FgAcupointLibraryController.java
浏览文件 @
4063587e
...
@@ -3,13 +3,13 @@ package com.zrqx.resource.fg.controller.acupointlibrary;
...
@@ -3,13 +3,13 @@ package com.zrqx.resource.fg.controller.acupointlibrary;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.util.bean.BeanUtils
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.resource.commons.model.acupointlibrary.AcupointLibrary
;
import
com.zrqx.resource.commons.model.acupointlibrary.AcupointLibrary
;
import
com.zrqx.resource.commons.model.acupointlibrary.AcupointLibraryDiyType
;
import
com.zrqx.resource.commons.model.acupointlibrary.AcupointLibraryDiyType
;
...
@@ -19,6 +19,7 @@ import com.zrqx.resource.commons.vo.bg.acupointlibrary.AcupointLibraryVO;
...
@@ -19,6 +19,7 @@ import com.zrqx.resource.commons.vo.bg.acupointlibrary.AcupointLibraryVO;
import
com.zrqx.resource.fg.service.FgResourceRelationService
;
import
com.zrqx.resource.fg.service.FgResourceRelationService
;
import
com.zrqx.resource.fg.service.acupointlibrary.FgAcupointLibraryDiyTypeService
;
import
com.zrqx.resource.fg.service.acupointlibrary.FgAcupointLibraryDiyTypeService
;
import
com.zrqx.resource.fg.service.acupointlibrary.FgAcupointLibraryService
;
import
com.zrqx.resource.fg.service.acupointlibrary.FgAcupointLibraryService
;
import
com.zrqx.resource.fg.service.videolibrary.FgVideoLibraryService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
...
app/resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java
0 → 100644
浏览文件 @
4063587e
package
com
.
zrqx
.
resource
.
fg
.
controller
.
resourcelibrary
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
import
org.jboss.logging.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.enums.resource.ResourceTypeEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.util.bean.BeanUtils
;
import
com.zrqx.core.util.datatype.ArrayUtils
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.resource.bg.service.ResourceRelationService
;
import
com.zrqx.resource.bg.service.acupointlibrary.AcupointLibraryService
;
import
com.zrqx.resource.bg.service.videolibrary.VideoLibraryService
;
import
com.zrqx.resource.commons.form.bg.QueryResourceForPoPForm
;
import
com.zrqx.resource.commons.form.bg.QueryResourceRelationForm
;
import
com.zrqx.resource.commons.form.bg.SaveResourceRelationForm
;
import
com.zrqx.resource.commons.form.bg.resource.QueryLibraryForm
;
import
com.zrqx.resource.commons.form.bg.resource.UpdateRelationForm
;
import
com.zrqx.resource.commons.model.resourcerelation.ResourceRelation
;
import
com.zrqx.resource.commons.vo.bg.ResourceRelationVo
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
tk.mybatis.mapper.entity.Example
;
/**
* 资源Controller
*/
@RestController
@RequestMapping
(
"/bg/resource"
)
@Api
(
description
=
"资源的公共接口"
)
public
class
FgResourceLibraryController
{
private
static
final
Logger
log
=
Logger
.
getLogger
(
FgResourceLibraryController
.
class
);
@Autowired
private
ResourceRelationService
resourceRelationService
;
@Autowired
private
VideoLibraryService
videoLibraryService
;
@Autowired
private
AcupointLibraryService
acupointLibraryService
;
//关联资源begin
@ApiOperation
(
value
=
"保存相关资源"
,
notes
=
"保存相关资源"
)
@PostMapping
(
value
=
"/relation-resource/save"
)
public
CallBack
<
Boolean
>
saveRelation
(
@RequestBody
SaveResourceRelationForm
entity
){
if
(
entity
.
getId
()
==
null
||
entity
.
getResourceIds
()
==
null
||
entity
.
getResourceType
()
==
null
||
entity
.
getResourceIds
().
length
==
0
){
throw
new
BaseException
(
"必须指定id、被关联的resourceId、资源类型"
);
}
List
<
ResourceRelation
>
recordList
=
new
ArrayList
<
ResourceRelation
>();
Arrays
.
asList
(
entity
.
getResourceIds
()).
forEach
(
resourceId
->
{
ResourceRelation
e
=
new
ResourceRelation
();
e
.
setObjectId
(
entity
.
getId
());
e
.
setResourceId
(
resourceId
);
e
.
setCreateTime
(
new
Date
());
e
.
setResourceType
(
entity
.
getResourceType
());
recordList
.
add
(
e
);
});
return
CallBack
.
success
(
resourceRelationService
.
insertList
(
recordList
));
}
@ApiOperation
(
"相关资源列表"
)
@GetMapping
(
value
=
"/relation-resource/get/page"
)
public
CallBack
<
PageInfo
<
ResourceRelationVo
>>
reousrceRelationPagePublic
(
QueryResourceRelationForm
entity
,
PageParam
pageParam
)
{
if
(
entity
==
null
||
entity
.
getId
()
==
null
)
{
throw
new
BaseException
(
"资源id不能为空!"
);
}
List
<
ResourceRelationVo
>
list
=
resourceRelationService
.
queryByIdAndResourceType
(
entity
,
pageParam
);
return
CallBack
.
success
(
new
PageInfo
<
ResourceRelationVo
>(
resourceRelationService
.
queryRelationList
(
list
)));
}
@ApiOperation
(
value
=
"批量删除关联资源"
,
notes
=
"批量删除"
)
@PostMapping
(
value
=
"/res/batch/delete"
)
public
CallBack
<
Boolean
>
deleteByResourceIds
(
@RequestBody
UpdateRelationForm
form
)
{
if
(
form
.
getId
().
isEmpty
())
{
throw
new
BaseException
(
"id不能为空"
);
}
List
<
Integer
>
ids
=
form
.
getId
();
Example
example
=
new
Example
(
ResourceRelation
.
class
);
example
.
createCriteria
().
andIn
(
"id"
,
ids
);
return
CallBack
.
success
(
resourceRelationService
.
deleteByExample
(
example
));
}
@ApiOperation
(
value
=
"关联资源修改排序号"
,
notes
=
"修改排序号"
)
@PostMapping
(
value
=
"/update/sort"
)
public
CallBack
<
Boolean
>
updateSort
(
@RequestBody
UpdateRelationForm
form
)
{
if
(
form
.
getId
().
isEmpty
())
{
throw
new
BaseException
(
"id不能为空"
);
}
List
<
Integer
>
ids
=
form
.
getId
();
Example
example
=
new
Example
(
ResourceRelation
.
class
);
example
.
createCriteria
().
andIn
(
"id"
,
ids
);
ResourceRelation
resourceRelation
=
new
ResourceRelation
();
resourceRelation
.
setSort
(
form
.
getSort
());
return
CallBack
.
success
(
resourceRelationService
.
UpdateByExampleSelective
(
resourceRelation
,
example
));
}
@ApiOperation
(
value
=
"获取资源最大排序号"
,
notes
=
"获取资源最大排序号"
)
@GetMapping
(
value
=
"/get/sort"
)
public
CallBack
<
Integer
>
getMaxSort
(
@RequestParam
Integer
resourceType
)
{
return
CallBack
.
success
(
resourceRelationService
.
getMaxSort
(
resourceType
));
}
@ApiOperation
(
value
=
"选择弹框中的列表"
,
notes
=
"资源类型 1图书、2专家、3文章、4图片、5视频、6音频、7课件、8专题、9课程"
)
@GetMapping
(
value
=
"/relation-resource/page"
)
public
CallBack
<
PageInfo
<?>>
queryRelationResource
(
QueryLibraryForm
form
,
PageParam
pageParam
){
if
(
StringUtils
.
isBlank
(
form
.
getId
())
||
form
.
getType
()
==
null
){
throw
new
BaseException
();
}
List
<
String
>
acupointList
=
null
;
List
<
String
>
videoIdList
=
null
;
//查询当前资源已关联的资源
List
<
QueryResourceForPoPForm
>
ls
=
null
;
//关联资源查询
ResourceRelation
er
=
new
ResourceRelation
();
er
.
setObjectId
(
form
.
getId
());
List
<
ResourceRelation
>
list
=
resourceRelationService
.
select
(
er
);
er
.
setResourceId
(
form
.
getId
());
er
.
setResourceType
(
form
.
getType
());
list
.
add
(
er
);
ls
=
BeanUtils
.
copyList
(
list
,
QueryResourceForPoPForm
.
class
);
if
(
ArrayUtils
.
isNotEmpty
(
ls
)){
Map
<
Integer
,
List
<
String
>>
resultMap
=
ls
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
QueryResourceForPoPForm
::
getResourceType
,
Collectors
.
mapping
(
QueryResourceForPoPForm
::
getResourceId
,
Collectors
.
toList
())));
videoIdList
=
resultMap
.
get
(
ResourceTypeEnum
.
VIDEO_LIBRARY
.
getCode
());
acupointList
=
resultMap
.
get
(
ResourceTypeEnum
.
ACUPOINT_LIBRARY
.
getCode
());
}
QueryResourceForPoPForm
f
=
new
QueryResourceForPoPForm
();
BeanUtils
.
copyProperties
(
form
,
f
);
//视频库列表查询
if
(
form
.
getResourceType
().
equals
(
ResourceTypeEnum
.
VIDEO_LIBRARY
.
getCode
())){
f
.
setIds
(
videoIdList
);
return
CallBack
.
success
(
videoLibraryService
.
pageByTitleAndDiyType
(
f
,
pageParam
));
}
//经络库查询
if
(
form
.
getResourceType
().
equals
(
ResourceTypeEnum
.
ACUPOINT_LIBRARY
.
getCode
())){
f
.
setIds
(
acupointList
);
return
CallBack
.
success
(
acupointLibraryService
.
pageByTitleAndDiyType
(
f
,
pageParam
));
}
return
CallBack
.
success
();
}
//关联资源end
}
app/resource/src/main/java/com/zrqx/resource/fg/service/FgResourceRelationService.java
浏览文件 @
4063587e
...
@@ -2,11 +2,13 @@ package com.zrqx.resource.fg.service;
...
@@ -2,11 +2,13 @@ package com.zrqx.resource.fg.service;
import
java.util.List
;
import
java.util.List
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.resource.commons.form.fg.resource.FgQueryRelatedForm
;
import
com.zrqx.resource.commons.form.fg.resource.FgQueryRelatedForm
;
import
com.zrqx.resource.commons.model.resourcerelation.ResourceRelation
;
import
com.zrqx.resource.commons.vo.fg.resource.FgAboutListVo
;
import
com.zrqx.resource.commons.vo.fg.resource.FgAboutListVo
;
public
interface
FgResourceRelationService
{
public
interface
FgResourceRelationService
extends
BaseService
<
ResourceRelation
,
Integer
>
{
/**
/**
* 获取相关资源列表
* 获取相关资源列表
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论