tianzeOrg
/
resource_center
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改资源中心查询接口

Browse Source
master
xiaoCJ 5 months ago
parent c24b2e73bd
commit 6e97c6c3f9
5 changed files with 443 additions and 433 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/sztzjy/resource_center/controller/CaseController.java
Unescape Escape View File

@ -254,7 +254,6 @@ public class CaseController {
}
@AnonymousAccess
@ApiOperation("批量绑定案例题")
@PostMapping("batchBindCase")
public ResultEntity<String> batchBindCase(@ApiParam("传全部参数") @RequestBody List<SysTopicAndCourse> sysTopicAndCourse) {
try {

5
src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java
Unescape Escape View File

@ -113,7 +113,7 @@ public class CaseApi {
@RequestParam(required = false) String schoolId) {
SysOneCatalog sysOneCatalogs = getSysOneCatalogs(systemOwner);
String oneId = sysOneCatalogs.getOneId();
List<SysCaseQuestion> list = caseQuestionMapper.selectCaseByConditions(keyword, oneId, schoolId,null,null);
List<SysCaseQuestion> list = caseQuestionMapper.selectCaseByConditions(keyword, oneId, schoolId, null, null);
PageInfo pageInfo1 = PageUtil.pageHelper(list, index, size);
return pageInfo1;
}
@ -398,6 +398,9 @@ public class CaseApi {
public List<SysCaseQuestionStepWithBLOBs> selectAllStepBySystemOwner(@RequestParam String systemOwner) {
SysOneCatalog sysOneCatalogs = getSysOneCatalogs(systemOwner);
List<String> ids = topicAndCourseMapper.getCaseIdsBySourceIsAdmin(sysOneCatalogs.getOneId());
if (ids == null || ids.isEmpty()) {
return new ArrayList<>(); //直接返回null学生端会报错
}
return caseQuestionStepMapper.getCaseStepByIds(ids);
}

5
src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java
Unescape Escape View File

@ -141,10 +141,11 @@ public class ResourceApi {
@AnonymousAccess
@ApiOperation("根据章节查看资源文件列表")
@PostMapping("selectResourceByChapterId")
//cf0954f2-3e6d-472b-b5eb-1a986f40f329 三级 //69fbffb4-2f1a-4faf-aa26-c4621a4851ba 一级
public List<SysResourceDto> selectResourceByChapterId(@RequestParam String oneId, //这里传的是一级的名称
@RequestParam String threeId) {
@RequestParam(required = false) String threeId) {
SysOneCatalog sysOneCatalogs = getSysOneCatalogs(oneId);
return sysResourceMapper.selectResource(sysOneCatalogs.getOneId(), null, null, threeId, null);
return sysResourceMapper.selectResource(sysOneCatalogs.getOneId(), null, threeId, null, null);
}

4
src/main/resources/generatorConfig.xml
Unescape Escape View File

@ -53,12 +53,12 @@
<!-- <table tableName="sys_three_catalog" domainObjectName="SysThreeCatalog" />-->
<!-- <table tableName="sys_topic_and_course" domainObjectName="SysTopicAndCourse" />-->
<!-- <table tableName="admin_case" domainObjectName="AdminCase" />-->
<table tableName="admin_data" domainObjectName="AdminData" />
<!-- <table tableName="admin_data" domainObjectName="AdminData" />-->
<!-- <table tableName="admin_collect_case" domainObjectName="AdminCollectCase" />-->
<!-- <table tableName="admin_collect_data" domainObjectName="AdminCollectData" />-->
<!-- <table tableName="admin_data_label" domainObjectName="AdminDataLabel" />-->
<!-- <table tableName="admin_file" domainObjectName="AdminFile" />-->
<!-- <table tableName="sys_knowledge_and_course" domainObjectName="SysKnowledgeAndCourse" />-->
<table tableName="sys_knowledge_and_course" domainObjectName="SysKnowledgeAndCourse" />
<!-- <table tableName="sys_knowledge_summary" domainObjectName="SysKnowledgeSummary" />-->
<!-- <table tableName="sys_two_catalog" domainObjectName="SysTwoCatalog" />-->
</context>

103
src/main/resources/mapper/SysResourceMapper.xml
Unescape Escape View File

@ -2,21 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sztzjy.resource_center.mapper.SysResourceMapper">
<resultMap id="BaseResultMap" type="com.sztzjy.resource_center.entity.SysResource">
<id column="resource_id" jdbcType="VARCHAR" property="resourceId" />
<result column="resource_name" jdbcType="VARCHAR" property="resourceName" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
<result column="resource_type" jdbcType="VARCHAR" property="resourceType" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="one_tag" jdbcType="VARCHAR" property="oneTag" />
<result column="one_name" jdbcType="VARCHAR" property="oneName" />
<result column="two_tag" jdbcType="VARCHAR" property="twoTag" />
<result column="two_name" jdbcType="VARCHAR" property="twoName" />
<result column="three_tag" jdbcType="VARCHAR" property="threeTag" />
<result column="three_name" jdbcType="VARCHAR" property="threeName" />
<result column="count" jdbcType="INTEGER" property="count" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<id column="resource_id" jdbcType="VARCHAR" property="resourceId"/>
<result column="resource_name" jdbcType="VARCHAR" property="resourceName"/>
<result column="url" jdbcType="VARCHAR" property="url"/>
<result column="picture_url" jdbcType="VARCHAR" property="pictureUrl"/>
<result column="resource_type" jdbcType="VARCHAR" property="resourceType"/>
<result column="source" jdbcType="VARCHAR" property="source"/>
<result column="one_tag" jdbcType="VARCHAR" property="oneTag"/>
<result column="one_name" jdbcType="VARCHAR" property="oneName"/>
<result column="two_tag" jdbcType="VARCHAR" property="twoTag"/>
<result column="two_name" jdbcType="VARCHAR" property="twoName"/>
<result column="three_tag" jdbcType="VARCHAR" property="threeTag"/>
<result column="three_name" jdbcType="VARCHAR" property="threeName"/>
<result column="count" jdbcType="INTEGER" property="count"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -36,7 +36,8 @@
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
<foreach close=")" collection="criterion.value" item="listItem" open="("
separator=",">
#{listItem}
</foreach>
</when>
@ -65,7 +66,8 @@
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
<foreach close=")" collection="criterion.value" item="listItem" open="("
separator=",">
#{listItem}
</foreach>
</when>
@ -77,18 +79,20 @@
</where>
</sql>
<sql id="Base_Column_List">
resource_id, resource_name, url, picture_url, resource_type, source, one_tag, one_name,
resource_id
, resource_name, url, picture_url, resource_type, source, one_tag, one_name,
two_tag, two_name, three_tag, three_name, count, status, create_time
</sql>
<select id="selectByExample" parameterType="com.sztzjy.resource_center.entity.SysResourceExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.sztzjy.resource_center.entity.SysResourceExample"
resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from sys_resource
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
<include refid="Example_Where_Clause"/>
</if>
<if test="orderByClause != null">
order by ${orderByClause}
@ -96,18 +100,19 @@
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from sys_resource
where resource_id = #{resourceId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from sys_resource
delete
from sys_resource
where resource_id = #{resourceId,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="com.sztzjy.resource_center.entity.SysResourceExample">
delete from sys_resource
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
<include refid="Example_Where_Clause"/>
</if>
</delete>
<insert id="insert" parameterType="com.sztzjy.resource_center.entity.SysResource">
@ -115,14 +120,12 @@
picture_url, resource_type, source,
one_tag, one_name, two_tag,
two_name, three_tag, three_name,
count, status, create_time
)
count, status, create_time)
values (#{resourceId,jdbcType=VARCHAR}, #{resourceName,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR},
#{pictureUrl,jdbcType=VARCHAR}, #{resourceType,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR},
#{oneTag,jdbcType=VARCHAR}, #{oneName,jdbcType=VARCHAR}, #{twoTag,jdbcType=VARCHAR},
#{twoName,jdbcType=VARCHAR}, #{threeTag,jdbcType=VARCHAR}, #{threeName,jdbcType=VARCHAR},
#{count,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
)
#{count,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.sztzjy.resource_center.entity.SysResource">
insert into sys_resource
@ -221,10 +224,11 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.sztzjy.resource_center.entity.SysResourceExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.sztzjy.resource_center.entity.SysResourceExample"
resultType="java.lang.Long">
select count(*) from sys_resource
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
<include refid="Example_Where_Clause"/>
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
@ -277,7 +281,7 @@
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
<include refid="Update_By_Example_Where_Clause"/>
</if>
</update>
<update id="updateByExample" parameterType="map">
@ -298,7 +302,7 @@
status = #{record.status,jdbcType=INTEGER},
create_time = #{record.createTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
<include refid="Update_By_Example_Where_Clause"/>
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.sztzjy.resource_center.entity.SysResource">
@ -369,25 +373,26 @@
</update>
<resultMap id="DtoMap" type="com.sztzjy.resource_center.entity.SysResource">
<id column="resource_id" jdbcType="VARCHAR" property="resourceId" />
<result column="resource_name" jdbcType="VARCHAR" property="resourceName" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
<result column="resource_type" jdbcType="VARCHAR" property="resourceType" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="one_id" jdbcType="VARCHAR" property="oneTag" />
<result column="one_name" jdbcType="VARCHAR" property="oneName" />
<result column="two_id" jdbcType="VARCHAR" property="twoTag" />
<result column="two_name" jdbcType="VARCHAR" property="twoName" />
<result column="three_id" jdbcType="VARCHAR" property="threeTag" />
<result column="three_name" jdbcType="VARCHAR" property="threeName" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<id column="resource_id" jdbcType="VARCHAR" property="resourceId"/>
<result column="resource_name" jdbcType="VARCHAR" property="resourceName"/>
<result column="url" jdbcType="VARCHAR" property="url"/>
<result column="picture_url" jdbcType="VARCHAR" property="pictureUrl"/>
<result column="resource_type" jdbcType="VARCHAR" property="resourceType"/>
<result column="source" jdbcType="VARCHAR" property="source"/>
<result column="one_id" jdbcType="VARCHAR" property="oneTag"/>
<result column="one_name" jdbcType="VARCHAR" property="oneName"/>
<result column="two_id" jdbcType="VARCHAR" property="twoTag"/>
<result column="two_name" jdbcType="VARCHAR" property="twoName"/>
<result column="three_id" jdbcType="VARCHAR" property="threeTag"/>
<result column="three_name" jdbcType="VARCHAR" property="threeName"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
</resultMap>
<!--重复-->
<select id="selectResourceByRepeat" parameterType="java.lang.String" resultMap="DtoMap">
SELECT sc.one_id,sc.two_id,sc.three_id,sc.one_name,sc.two_name,sc.three_name,sr.resource_name,sr.resource_id,sr.url,sr.picture_url,sr.resource_type,sr.source,sr.status,sr.create_time
SELECT
sc.one_id,sc.two_id,sc.three_id,sc.one_name,sc.two_name,sc.three_name,sr.resource_name,sr.resource_id,sr.url,sr.picture_url,sr.resource_type,sr.source,sr.status,sr.create_time
FROM sys_resource sr
left JOIN
sys_resource_and_course sc
@ -411,7 +416,8 @@
<!--不重复-->
<select id="selectResource" parameterType="java.lang.String" resultMap="DtoMap">
SELECT DISTINCT sc.one_id,sc.two_id,sc.three_id,sc.one_name,sc.two_name,sc.three_name,sr.resource_name,sr.resource_id,sr.url,sr.picture_url,sr.resource_type,sr.source,sr.status,sr.create_time
SELECT DISTINCT
sc.one_id,sc.two_id,sc.three_id,sc.one_name,sc.two_name,sc.three_name,sr.resource_name,sr.resource_id,sr.url,sr.picture_url,sr.resource_type,sr.source,sr.status,sr.create_time
FROM sys_resource sr
left JOIN
sys_resource_and_course sc
@ -429,6 +435,7 @@
<if test="source != null and source != ''">
and sr.source in (#{source},'管理员')
</if>
and sr.source ='管理员'
<if test="name != null and name != ''">
and sr.resource_name LIKE CONCAT('%', #{name}, '%')
</if>

Write Preview
Loading…
Cancel
Save