From 41e4fa2ef1768425864967f23810c25b0e36c635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 30 Oct 2020 15:10:03 +0800 Subject: [PATCH] add exception --- .../controller/AssessManagerController.java | 40 +++++++++++++++++-- .../controller/ChartController.java | 26 ++++++++++-- .../controller/UserTaskController.java | 10 ++++- 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index b8b6b0ae..4aa7cc3a 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -8,6 +8,7 @@ import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.performance.req.AssessChangeReq; import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.AssessDetailReq; +import com.lz.modules.performance.req.AssessToScoreReq; import com.lz.modules.performance.res.AssessManagerDetailRes; import com.lz.modules.performance.res.AssessManagerListRes; import com.lz.modules.performance.res.ChartStatistical; @@ -17,6 +18,7 @@ import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,6 +31,7 @@ import java.util.List; */ @RestController @RequestMapping("/performance") +@Slf4j @Api(value="考核管理接口", tags={"考核管理"}) public class AssessManagerController { @@ -57,7 +60,13 @@ public class AssessManagerController { if(req.getStartId()==null){ return R.error("考核id不能为空"); } - PageUtils pageUtils = assessManagerService.assessDetail(req); + PageUtils pageUtils = null; + try { + pageUtils = assessManagerService.assessDetail(req); + } catch (Exception e) { + log.error("获取考核详情列表异常" ,e); + return R.error(); + } return R.ok().put("data",pageUtils); } @@ -71,7 +80,13 @@ public class AssessManagerController { if(req.getStartId()==null){ return R.error("考核id不能为空"); } - List process = chartResultService.countAssessNumByFlowProcess(req); + List process = null; + try { + process = chartResultService.countAssessNumByFlowProcess(req); + } catch (Exception e) { + log.error("获取详情顶部人数统计异常" ,e); + return R.error(); + } return R.ok().put("data",process); } @@ -93,6 +108,7 @@ public class AssessManagerController { try { assessManagerService.assessChange(req); } catch (Exception e) { + log.error("考核管理变更异常" ,e); return R.error(e.getMessage()); } return R.ok(); @@ -112,7 +128,25 @@ public class AssessManagerController { if(flowStart == null){ return R.error("没有此条记录"); } - assessManagerService.accessDelete(flowStart); + try { + assessManagerService.accessDelete(flowStart); + } catch (Exception e) { + log.error("删除考核任务异常, id:" + assessId ,e); + return R.error(); + } + return R.ok(); + } + + @PostMapping("assess/manager/toScore") + @ApiOperation("开始评分") + @ApiResponses({@ApiResponse(code = 200,message = "成功")}) + public R assessToScore(@RequestBody @ApiParam AssessToScoreReq req){ + try { + assessManagerService.toScore(req); + } catch (Exception e) { + log.error("开始评分异常" ,e); + return R.error(); + } return R.ok(); } } diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index 005aacf1..55b9492a 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -15,6 +15,7 @@ import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,6 +29,7 @@ import java.util.*; @RestController @RequestMapping("/performance") @Api(value="报表接口", tags={"绩效报表"}) +@Slf4j public class ChartController extends AbstractController{ @Autowired private ChartResultService chartResultService; @@ -38,7 +40,13 @@ public class ChartController extends AbstractController{ @ApiOperation("获取绩效报表统计") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){ - List chartStatisticalRes = chartResultService.chartReport(startId); + List chartStatisticalRes = null; + try { + chartStatisticalRes = chartResultService.chartReport(startId); + } catch (Exception e) { + log.error("获取绩效报表统计异常" ,e); + return R.error(); + } return R.ok().put("data",chartStatisticalRes); } @@ -47,7 +55,13 @@ public class ChartController extends AbstractController{ @ApiOperation("获取考核类型列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStartsRes.class)}) public R chartStarts(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true)ChartStartsReq req){ - PageUtils pageUtils = chartResultService.chartStarts(req); + PageUtils pageUtils = null; + try { + pageUtils = chartResultService.chartStarts(req); + } catch (Exception e) { + log.error("获取考核类型列表异常" ,e); + return R.error(); + } return R.ok().put("data",pageUtils); } @@ -56,7 +70,13 @@ public class ChartController extends AbstractController{ @ApiOperation("获取报表等级详情") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)}) public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ - PageUtils pageUtils = chartResultService.selectChartDetailList(req); + PageUtils pageUtils = null; + try { + pageUtils = chartResultService.selectChartDetailList(req); + } catch (Exception e) { + log.error("获取报表等级详情异常" ,e); + return R.error(); + } return R.ok().put("data",pageUtils); } diff --git a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java index 9d15de2f..b4ea27be 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -7,6 +7,7 @@ import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.performance.service.AssessService; import com.lz.modules.sys.controller.AbstractController; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/performance") +@Slf4j @Api(value="事项接口", tags={"用户任务"}) public class UserTaskController extends AbstractController{ @Autowired @@ -29,7 +31,13 @@ public class UserTaskController extends AbstractController{ @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ - PageUtils pageUtils = assessService.userTaskList(req, 313L); + PageUtils pageUtils = null; + try { + pageUtils = assessService.userTaskList(req, 313L); + } catch (Exception e) { + log.error("获取用户事项异常" ,e); + return R.error(); + } return R.ok().put("data",pageUtils); } }