diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/common/CourseController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/common/CourseController.java index 8728d75..a472b18 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/common/CourseController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/common/CourseController.java @@ -74,6 +74,7 @@ public class CourseController { list.add(Constant.BUILT_IN_SCHOOL_ID); criteria.andSchoolIdIn(list); } + example.setOrderByClause("sequence asc"); List courseList = courseMapper.selectByExample(example); return new ResultEntity(HttpStatus.OK,"展示成功",courseList); } @@ -85,6 +86,7 @@ public class CourseController { public ResultEntity> selectChapterByCourseId(@RequestParam String courseId){ SysCourseChapterExample example = new SysCourseChapterExample(); example.createCriteria().andCourseIdEqualTo(courseId); + example.setOrderByClause("sequence asc"); List chapterList = chapterMapper.selectByExample(example); return new ResultEntity(HttpStatus.OK, "展示成功", chapterList); } @@ -119,7 +121,7 @@ public class CourseController { //增加章节 - @GetMapping("insertChapter") + @PostMapping("insertChapter") @ApiOperation("增加章节") @AnonymousAccess public ResultEntity insertChapter(@ApiParam("新增课程对象") @RequestBody SysCourseChapter chapter,@RequestParam String schoolId) { @@ -150,7 +152,7 @@ public class CourseController { @AnonymousAccess public ResultEntity deleteChapter(@ApiParam("删除章节Id") @RequestParam String chapterId, @RequestParam String schoolId){ - if(Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){ + if(!Constant.BUILT_IN_SCHOOL_ID.equals(schoolId)){ return new ResultEntity<>(HttpStatus.BAD_REQUEST,"权限不足"); } int i = chapterMapper.deleteByPrimaryKey(chapterId); diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java index 277616a..ab983cf 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java @@ -115,12 +115,19 @@ public class StuIndexController { public ResultEntity> getIndexResourceCenter(@RequestParam String schoolId) { Map map = new HashMap<>(); List list = teaResourceCenterMapper.getSizeByType(schoolId); - Integer key = list.get(0); - Integer value = list.get(1); - map.put("视频数量", key); - map.put("课件数量", value); - map.put("资源总量", key + value); - return new ResultEntity<>(map); + if(list==null || list.isEmpty()){ + map.put("视频数量", 0); + map.put("课件数量", 0); + map.put("资源总量", 0); + return new ResultEntity<>(map); + }else { + Integer key = list.get(0); + Integer value = list.get(0); + map.put("视频数量", key); + map.put("课件数量", value); + map.put("资源总量", key + value); + return new ResultEntity<>(map); + } } 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 7af9fd8..581b557 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 @@ -57,6 +57,7 @@ public class TeaResourceCenterController { @ApiParam("课程Id") @RequestParam String courseId, @ApiParam("章节id") @RequestParam(required = false) String chapterId, @ApiParam("上传文件类型 文件/视频") @RequestParam String type) { + System.out.println(file.getSize()); Boolean flag = resourceCenterService.uploadResource(file, schoolId, courseId,type,chapterId); if (flag) { return new ResultEntity<>(HttpStatus.OK, "新增成功"); @@ -116,10 +117,19 @@ public class TeaResourceCenterController { if (videoFile.exists()) { Path path = Paths.get(videoPath); FileSystemResource fileSystemResource = new FileSystemResource(videoFile); - return ResponseEntity.ok() - .contentType(MediaType.parseMediaType("application/pdf")) - .body(fileSystemResource); - + if(url.endsWith("pptx")){ + return ResponseEntity.ok() + .contentType(MediaType.parseMediaType("application/vnd.openxmlformats-officedocument.presentationml.presentation")) + .body(fileSystemResource); + }else if(url.endsWith("ppt")){ + return ResponseEntity.ok() + .contentType(MediaType.parseMediaType("application/vnd.ms-powerpoint")) + .body(fileSystemResource); + }else { + return ResponseEntity.ok() + .contentType(MediaType.parseMediaType("application/pdf")) + .body(fileSystemResource); + } } else { return ResponseEntity.notFound().build(); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/stu/impl/TheoryTestServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/stu/impl/TheoryTestServiceImpl.java index c3d645c..eab05df 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/stu/impl/TheoryTestServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/stu/impl/TheoryTestServiceImpl.java @@ -62,10 +62,13 @@ public class TheoryTestServiceImpl implements ITheoryTestService { List multipleIdList = Arrays.asList(multipleIds.substring(1, multipleIds.length() - 1).split(", ")); List judgeIdList = Arrays.asList(judgeIds.substring(1, judgeIds.length() - 1).split(", ")); List idlist=new ArrayList<>(); - idlist.addAll(singleIdList); - idlist.addAll(multipleIdList); - idlist.addAll(judgeIdList); - List returnQuestionList = objectiveQuestionMapper.selectBatchByIdList(idlist); + List singleQuestionList = objectiveQuestionMapper.selectBatchByIdList(singleIdList); + List mulQuestionList = objectiveQuestionMapper.selectBatchByIdList(multipleIdList); + List judgeQuestionList = objectiveQuestionMapper.selectBatchByIdList(judgeIdList); + List returnQuestionList = new ArrayList<>(); + returnQuestionList.addAll(singleQuestionList); + returnQuestionList.addAll(mulQuestionList); + returnQuestionList.addAll(judgeQuestionList); return returnQuestionList; } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 49b8dab..b175d36 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring: datasource: druid: db-type: mysql - url: jdbc:mysql://${DB_HOST:118.31.7.2}:${DB_PORT:3306}/${DB_NAME:financial_bigdata}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://${DB_HOST:120.78.220.29}:${DB_PORT:3307}/${DB_NAME:financial_bigdata}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:sztzjy2017} driver-class-name: com.mysql.cj.jdbc.Driver @@ -11,7 +11,8 @@ spring: # 文件存储 file: type: local - path: D:/test + path: /usr/local/tianzeProject/financial_bigdata/uploadFile + timer: enable: false diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index edaeb04..50e90dc 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,11 +1,11 @@ +#天金融大数据 spring: datasource: druid: db-type: mysql - url: jdbc:mysql://${DB_HOST:211.70.163.178}:${DB_PORT:3306}/${DB_NAME:financial_bigdata}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true -# url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:fund_investment}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://${DB_HOST:120.78.220.29}:${DB_PORT:3307}/${DB_NAME:financial_bigdata}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: ${DB_USER:root} - password: ${DB_PWD:WxxyDB@2023} + password: ${DB_PWD:sztzjy2017} driver-class-name: com.mysql.cj.jdbc.Driver @@ -17,9 +17,8 @@ file: timer: enable: false - swagger: - enable: false + enable: true tokenHeader: Authorization title: 天择外汇模拟交易 • 接口文档 description: 天择外汇模拟交易WebAPI接口文档 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 94b31a8..8725693 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -2,9 +2,9 @@ spring: datasource: druid: db-type: mysql - url: jdbc:mysql://${DB_HOST:120.79.54.255}:${DB_PORT:3306}/${DB_NAME:financial_bigdata}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://${DB_HOST:118.31.7.2}:${DB_PORT:3306}/${DB_NAME:financial_bigdata}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: ${DB_USER:root} - password: ${DB_PWD:Sztzjy506} + password: ${DB_PWD:sztzjy2017} driver-class-name: com.mysql.cj.jdbc.Driver @@ -15,4 +15,13 @@ file: timer: - enable: true \ No newline at end of file + enable: false + +swagger: + enable: true + tokenHeader: Authorization + title: 天择外汇模拟交易 • 接口文档 + description: 天择外汇模拟交易WebAPI接口文档 + contactName: 深圳天择教育科技有限公司 + contactAddress: www.sztzjy.com + version: @project.version@ \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 952bceb..c2dc44e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,9 @@ server: - port: 8838 +# port: 8838 #金融大数据 +# port: 8848 #天择证券大数据实训平台 + port: 8858 #天择银行大数据实训平台 +# port: 8868 +# port: 8878 servlet: context-path: / tomcat: @@ -13,7 +17,7 @@ spring: application: name: trading_system profiles: - active: dev + active: protwo mvc: pathmatch: matching-strategy: ant_path_matcher diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index 0d658cd..d3d5046 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -47,7 +47,7 @@ - + @@ -55,8 +55,9 @@ - + +