单项比赛问题修改 7.31

main
zhc077 4 months ago
parent 9e7c468932
commit 6ed229e07b
  1. 9
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java
  2. 5
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java

@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation; import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation;
import org.jeecg.modules.demo.bigScreen.service.CompSystemBigScreenService; import org.jeecg.modules.demo.bigScreen.service.CompSystemBigScreenService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -31,6 +32,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
@Autowired @Autowired
private CompSystemBigScreenService compSystemBigScreenService; private CompSystemBigScreenService compSystemBigScreenService;
@AutoLog(value = "河南机电-比赛数据综合大屏")
@ApiOperation(value = "河南机电-比赛数据综合展示", notes = "河南机电-比赛数据综合展示") @ApiOperation(value = "河南机电-比赛数据综合展示", notes = "河南机电-比赛数据综合展示")
@GetMapping(value = "/composite") @GetMapping(value = "/composite")
public Result composite(HttpServletRequest req) { public Result composite(HttpServletRequest req) {
@ -38,6 +40,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "河南机电-部门大屏")
@ApiOperation(value = "河南机电-部门比赛数据展示", notes = "河南机电-部门比赛数据展示") @ApiOperation(value = "河南机电-部门比赛数据展示", notes = "河南机电-部门比赛数据展示")
@GetMapping(value = "/depart") @GetMapping(value = "/depart")
public Result bigScreen4Depart(String departId) { public Result bigScreen4Depart(String departId) {
@ -45,6 +48,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "河南机电-单个比赛大屏")
@ApiOperation(value = "河南机电-单个比赛数据展示", notes = "河南机电-单个比赛数据展示") @ApiOperation(value = "河南机电-单个比赛数据展示", notes = "河南机电-单个比赛数据展示")
@GetMapping(value = "/singleComp") @GetMapping(value = "/singleComp")
public Result singleComp(String compId) { public Result singleComp(String compId) {
@ -52,6 +56,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "河南机电-学生个人能力大屏")
@ApiOperation(value = "学生个人能力大屏", notes = "学生个人能力大屏") @ApiOperation(value = "学生个人能力大屏", notes = "学生个人能力大屏")
@GetMapping(value = "/student") @GetMapping(value = "/student")
public Result bigScreen4Student(String workNo) { public Result bigScreen4Student(String workNo) {
@ -59,24 +64,28 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "院系-参赛大屏")
@ApiOperation(value = "河南机电-院系参赛大屏数据", notes = "河南机电-院系参赛大屏数据") @ApiOperation(value = "河南机电-院系参赛大屏数据", notes = "河南机电-院系参赛大屏数据")
@GetMapping(value = "/canSai") @GetMapping(value = "/canSai")
public Result canSai() { public Result canSai() {
return Result.ok(compSystemBigScreenService.canSai()); return Result.ok(compSystemBigScreenService.canSai());
} }
@AutoLog(value = "院系-能力大屏")
@ApiOperation(value = "河南机电-院系能力大屏数据", notes = "河南机电-院系能力大屏数据") @ApiOperation(value = "河南机电-院系能力大屏数据", notes = "河南机电-院系能力大屏数据")
@GetMapping(value = "/nengLi") @GetMapping(value = "/nengLi")
public Result nengLi() { public Result nengLi() {
return Result.ok(compSystemBigScreenService.nengLi()); return Result.ok(compSystemBigScreenService.nengLi());
} }
@AutoLog(value = "院系-获奖大屏")
@ApiOperation(value = "河南机电-院系获奖大屏数据", notes = "河南机电-院系获奖大屏数据") @ApiOperation(value = "河南机电-院系获奖大屏数据", notes = "河南机电-院系获奖大屏数据")
@GetMapping(value = "/huoJiang") @GetMapping(value = "/huoJiang")
public Result huoJiang() { public Result huoJiang() {
return Result.ok(compSystemBigScreenService.huoJiang()); return Result.ok(compSystemBigScreenService.huoJiang());
} }
@AutoLog(value = "院系-得分大屏")
@ApiOperation(value = "河南机电-院系各比赛类型得分大屏数据", notes = "河南机电-院系各比赛类型得分大屏数据") @ApiOperation(value = "河南机电-院系各比赛类型得分大屏数据", notes = "河南机电-院系各比赛类型得分大屏数据")
@GetMapping(value = "/deFei") @GetMapping(value = "/deFei")
public Result deFei() { public Result deFei() {

@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.demo.homepage.service.UserHomePageService; import org.jeecg.modules.demo.homepage.service.UserHomePageService;
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;
@ -28,6 +29,7 @@ public class UserHomePageController {
@Autowired @Autowired
private UserHomePageService homePageService; private UserHomePageService homePageService;
@AutoLog(value = "学校首页")
@ApiOperation(value = "河南机电-学校首页", notes = "河南机电-学校首页") @ApiOperation(value = "河南机电-学校首页", notes = "河南机电-学校首页")
@GetMapping(value = "/school") @GetMapping(value = "/school")
public Result school(HttpServletRequest req) { public Result school(HttpServletRequest req) {
@ -35,6 +37,7 @@ public class UserHomePageController {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "部门首页")
@ApiOperation(value = "河南机电-部门首页", notes = "河南机电-部门首页") @ApiOperation(value = "河南机电-部门首页", notes = "河南机电-部门首页")
@GetMapping(value = "/depart") @GetMapping(value = "/depart")
public Result depart(String orgCode) { public Result depart(String orgCode) {
@ -42,6 +45,7 @@ public class UserHomePageController {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "学校管理员-分析报告")
@ApiOperation(value = "河南机电-学校综合报告", notes = "河南机电-学校综合报告") @ApiOperation(value = "河南机电-学校综合报告", notes = "河南机电-学校综合报告")
@GetMapping(value = "/report4School") @GetMapping(value = "/report4School")
public Result report4School(HttpServletRequest req) { public Result report4School(HttpServletRequest req) {
@ -49,6 +53,7 @@ public class UserHomePageController {
return Result.ok(result); return Result.ok(result);
} }
@AutoLog(value = "部门管理员-分析报告")
@ApiOperation(value = "河南机电-部门综合报告", notes = "河南机电-部门综合报告") @ApiOperation(value = "河南机电-部门综合报告", notes = "河南机电-部门综合报告")
@GetMapping(value = "/report4Depart") @GetMapping(value = "/report4Depart")
public Result report4Depart(String orgCode) { public Result report4Depart(String orgCode) {

Loading…
Cancel
Save