diff --git a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java index 9803582..ded7c52 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java +++ b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java @@ -17,31 +17,6 @@ public class Constant { */ public static final String BASIC = "Basic"; - public static final String MULTIPLECHOICE = "多选题"; + public static final String BUILT_IN_SCHOOL_ID= "999999999"; - public static final String ZSCETK = "知识测评题库"; - public static final String XMJDTK = "项目尽调题库"; - public static final String XMGZTK = "项目估值题库"; - public static final String IPOBK = "上市板块相关题库"; - public static final String IPOTJ = "上市条件相关题库"; - public static final String ZZXZ = "自主新增"; - - public static final Integer ONEDAY = 1; - public static final Integer FIVEDAY = 5; - public static final Integer TWENTYDAY = 20; - public static final Integer ONEMONTH = 30; - public static final Integer THREEMONTHS = 90; - public static final Integer SIXMONTHS = 180; - public static final String NINE = "999"; - - public static final String TZBG = "投资报告"; - - public static final String FINISHED = "已完成"; - public static final String UNFINISHED = "未完成"; - - public static final String XMGZFX = "项目评估分析"; - public static final String YWJDJL = "业务尽调结论"; - public static final String CWJDJL = "财务尽调结论"; - public static final String XDGZJL = "相对估值结论"; - public static final String JDGZJL = "绝对估值结论"; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaObjectiveController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaObjectiveController.java index 27d1237..fdcdc66 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaObjectiveController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaObjectiveController.java @@ -1,34 +1,82 @@ package com.sztzjy.financial_bigdata.controller.tea; +import com.github.pagehelper.PageInfo; import com.sztzjy.financial_bigdata.entity.SysObjectiveQuestion; import com.sztzjy.financial_bigdata.service.tea.ITeaObjectiveService; import com.sztzjy.financial_bigdata.util.ResultEntity; +import com.sztzjy.financial_bigdata.util.file.IFileUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; + @RestController @Api(tags = "教师端--资源中心-题库管理") @RequestMapping("api/tea/objective") public class TeaObjectiveController { @Autowired ITeaObjectiveService teaObjectiveService; + @Autowired + IFileUtil fileUtil; + @Value("${file.path}") + private String filePath; //客观题新增 @PostMapping("insertObjective") @ApiOperation("客观题新增") public ResultEntity insertObjective(@RequestBody SysObjectiveQuestion objectiveQuestion) { - Boolean flag=teaObjectiveService.insertObjective(objectiveQuestion); - if (flag){ - return new ResultEntity<>(HttpStatus.OK,"客观题新增成功"); - }else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST,"客观题新增失败"); + Boolean flag = teaObjectiveService.insertObjective(objectiveQuestion); + if (flag) { + return new ResultEntity<>(HttpStatus.OK, "客观题新增成功"); + } else { + return new ResultEntity<>(HttpStatus.BAD_REQUEST, "客观题新增失败"); } } - //客观题批量导入 + //客观题删除 + @GetMapping("/deleteObjective") + @ApiOperation("客观题删除") + public ResultEntity deleteObjective(@ApiParam("客观题ID") @RequestParam String objectiveId, + @RequestParam String schoolId) { + Boolean flag = teaObjectiveService.deleteObjective(objectiveId,schoolId); + if (flag) { + return new ResultEntity<>(HttpStatus.OK, "客观题删除成功"); + } else { + return new ResultEntity<>(HttpStatus.BAD_REQUEST, "客观题新增失败"); + } + } + //客观题列表查看 + @GetMapping("/selectObjectiveList") + @ApiOperation("客观题列表查看") + public ResultEntity> selectObjectiveList(@RequestParam String schoolId, + @RequestParam Integer index, + @RequestParam Integer size) { + PageInfo pageInfo=teaObjectiveService.selectObjectiveList(schoolId,index,size); + return new ResultEntity<>(HttpStatus.OK, "客观题删除成功",pageInfo); + } + //客观题单个详情查看 + @GetMapping("/selectObjectiveDetails") + @ApiOperation("客观题单个详情查看") + public ResultEntity selectObjectiveDetails(@ApiParam("客观题ID") @RequestParam String objectiveId){ + SysObjectiveQuestion objectiveQuestion=teaObjectiveService.selectObjectiveDetails(objectiveId); + return new ResultEntity<>(HttpStatus.OK, "客观题删除成功",objectiveQuestion); + } + + //客观题导入模板下载 + @GetMapping("downloadResource") + @ApiOperation("客观题导入模板下载") + public void downloadResource(HttpServletResponse response) { + fileUtil.download(response, "客观题导入模板.xlsx", filePath); + } + + //客观题批量导入 + + } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaResourceCenterController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaResourceCenterController.java index bf6caaf..7a4a829 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaResourceCenterController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaResourceCenterController.java @@ -1,5 +1,6 @@ package com.sztzjy.financial_bigdata.controller.tea; +import com.sztzjy.financial_bigdata.annotation.AnonymousAccess; import com.sztzjy.financial_bigdata.entity.TeaResourceCenter; import com.sztzjy.financial_bigdata.entity.TeaResourceCenterExample; import com.sztzjy.financial_bigdata.mapper.TeaResourceCenterMapper; @@ -56,6 +57,7 @@ public class TeaResourceCenterController { } //查看资源文件列表 + @AnonymousAccess @GetMapping("selectResource") @ApiOperation("查看资源文件列表,图片资源使用默认图片") public ResultEntity> uploadResourceCenter(@ApiParam("学校id") @RequestParam(required = false) String schoolId, diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/common/impl/CourseServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/common/impl/CourseServiceImpl.java index 29048e9..6f7a5a0 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/common/impl/CourseServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/common/impl/CourseServiceImpl.java @@ -2,8 +2,8 @@ package com.sztzjy.financial_bigdata.service.common.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.sztzjy.financial_bigdata.config.Constant; import com.sztzjy.financial_bigdata.entity.SysCourse; -import com.sztzjy.financial_bigdata.entity.SysCourseChapter; import com.sztzjy.financial_bigdata.entity.SysCourseExample; import com.sztzjy.financial_bigdata.mapper.SysCourseMapper; import com.sztzjy.financial_bigdata.service.common.ICourseService; @@ -39,7 +39,8 @@ public class CourseServiceImpl implements ICourseService { }else { course.setSequence(sysCourses.get(0).getSequence()+1); } - if ("999999999".equals(course.getSchoolId())) { //代表内置数据传递 + if (Constant.BUILT_IN_SCHOOL_ID.equals(course.getSchoolId())) { //代表内置数据传递 + course.setInputType("1"); } else { //老师自主上传 course.setInputType("0"); diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaObjectiveService.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaObjectiveService.java index cd065a3..b7ed10f 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaObjectiveService.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaObjectiveService.java @@ -1,7 +1,16 @@ package com.sztzjy.financial_bigdata.service.tea; +import com.github.pagehelper.PageInfo; import com.sztzjy.financial_bigdata.entity.SysObjectiveQuestion; +import java.util.List; + public interface ITeaObjectiveService { Boolean insertObjective(SysObjectiveQuestion objectiveQuestion); + + Boolean deleteObjective(String objectiveId, String schoolId); + + PageInfo selectObjectiveList(String schoolId, Integer index, Integer size); + + SysObjectiveQuestion selectObjectiveDetails(String objectiveId); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaObjectiveServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaObjectiveServiceImpl.java index 0e17b7f..c7a18bf 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaObjectiveServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaObjectiveServiceImpl.java @@ -1,11 +1,16 @@ package com.sztzjy.financial_bigdata.service.tea.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sztzjy.financial_bigdata.config.Constant; import com.sztzjy.financial_bigdata.entity.SysObjectiveQuestion; +import com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample; import com.sztzjy.financial_bigdata.mapper.SysObjectiveQuestionMapper; import com.sztzjy.financial_bigdata.service.tea.ITeaObjectiveService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.UUID; @Service @@ -15,7 +20,7 @@ public class TeaObjectiveServiceImpl implements ITeaObjectiveService { @Override public Boolean insertObjective(SysObjectiveQuestion objectiveQuestion) { //数据库需要添加schoolid字段 - if("999999999".equals(objectiveQuestion.getSchoolId())){ + if(Constant.BUILT_IN_SCHOOL_ID.equals(objectiveQuestion.getSchoolId())){ objectiveQuestion.setInputType("内置"); }else { objectiveQuestion.setInputType("新增"); @@ -28,4 +33,41 @@ public class TeaObjectiveServiceImpl implements ITeaObjectiveService { return false; } } + + @Override + public Boolean deleteObjective(String objectiveId, String schoolId) { + SysObjectiveQuestion sysObjectiveQuestion = objectiveQuestionMapper.selectByPrimaryKey(objectiveId); + if(!Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){ + if(sysObjectiveQuestion.getSchoolId().equals(Constant.BUILT_IN_SCHOOL_ID)){ + return false; + }else { + objectiveQuestionMapper.deleteByPrimaryKey(objectiveId); + return true; + } + }else { + objectiveQuestionMapper.deleteByPrimaryKey(objectiveId); + return true; + } + + } + + @Override + public PageInfo selectObjectiveList(String schoolId, Integer index, Integer size) { + PageHelper.startPage(index, size); + SysObjectiveQuestionExample example=new SysObjectiveQuestionExample(); + SysObjectiveQuestionExample.Criteria criteria = example.createCriteria(); + SysObjectiveQuestionExample.Criteria criteria2 = example.createCriteria(); + criteria.andSchoolIdEqualTo(schoolId); + criteria2.andSchoolIdEqualTo(Constant.BUILT_IN_SCHOOL_ID); + example.or(criteria2); + List objectiveQuestionList = objectiveQuestionMapper.selectByExample(example); + PageInfo pageInfo = new PageInfo<>(objectiveQuestionList); + return pageInfo; + } + + @Override + public SysObjectiveQuestion selectObjectiveDetails(String objectiveId) { + SysObjectiveQuestion objectiveQuestion = objectiveQuestionMapper.selectByPrimaryKey(objectiveId); + return objectiveQuestion; + } } diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaResourceCenterServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaResourceCenterServiceImpl.java index 8541f44..e39ae00 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaResourceCenterServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaResourceCenterServiceImpl.java @@ -44,7 +44,7 @@ public class TeaResourceCenterServiceImpl implements ITeaResourceCenterService { TeaResourceCenterExample.Criteria criteria = example.createCriteria(); TeaResourceCenterExample.Criteria criteria2 = example.createCriteria(); criteria.andChapterIdEqualTo(chapterId).andSchoolIdEqualTo(schoolId); - criteria2.andChapterIdEqualTo(chapterId).andSchoolIdEqualTo(null); + criteria2.andChapterIdEqualTo(chapterId).andSchoolIdIsNull(); example.or(criteria2); List teaResourceCenterList = resourceCenterMapper.selectByExample(example); return teaResourceCenterList;