sws
/
EXEED_back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 首页任务数据添加任务/人员筛选

Browse Source
master
zhangjinli 2 years ago
parent e20db155b8
commit bb476496d4
2 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File

77
src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
Unescape View File

@ -58,6 +58,10 @@ public class StatisticsController {
@Data
static class SSParam {
@Schema(title = "任务Id")
private int taskId;
@Schema(title = "员工Id")
private int userId;
@Schema(title = "时间条件", description = "1今日;2本周;3本月;4全年")
private int dateCondition;
@Schema(title = "开始时间(yyyy-MM-dd HH:mm:ss)", description = "如果传入dateCondition以月份区间为条件")
@ -72,41 +76,40 @@ public class StatisticsController {
@PostMapping("/data2")
@AdminTokenValid
public Result data2(@Validated @RequestBody SSParam param) {
Integer condition = param.getDateCondition();
System.out.println(condition);
int condition = param.getDateCondition();
QueryWrapper<Video> qw = new QueryWrapper<>();
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
DateTimeFormatter df2 = DateTimeFormatter.ofPattern("yyyy-MM");
LocalDate now = LocalDateTime.now().toLocalDate();
LocalDate before =now.with(TemporalAdjusters.firstDayOfMonth());
if (null != condition) {
switch (condition) {
case 1:
before = now;
break;
case 2:
before = now.with(DayOfWeek.MONDAY);
break;
case 3:
before = now.with(TemporalAdjusters.firstDayOfMonth());
break;
case 4:
before = now.with(TemporalAdjusters.firstDayOfYear());
break;
default:
}
} else {
before = param.getBeginTime() != null ? param.getBeginTime().toLocalDate() : before;
now = param.getEndTime() != null ? param.getEndTime().toLocalDate() : now;
LocalDate before = now.with(TemporalAdjusters.firstDayOfMonth());
switch (condition) {
case 1:
before = now;
break;
case 2:
before = now.with(DayOfWeek.MONDAY);
break;
case 3:
before = now.with(TemporalAdjusters.firstDayOfMonth());
break;
case 4:
before = now.with(TemporalAdjusters.firstDayOfYear());
break;
default:
before = param.getBeginTime() != null ? param.getBeginTime().toLocalDate() : before;
now = param.getEndTime() != null ? param.getEndTime().toLocalDate() : now;
}
if(param.getTaskId()>0){
qw.eq("taskId", param.getTaskId());
}
if(param.getUserId()>0){
qw.eq("userId", param.getUserId());
}
ArrayList<JSONObject> res = new ArrayList<>();
if(condition == 4){
if (4 == condition) {
qw.between("date_format(creatAt, '%Y-%m')", before.format(df2), now.plusMonths(1).format(df2));
List<JSONObject> videoDataBydDay =adminMapper.statistics3(qw);
if (videoDataBydDay == null || videoDataBydDay.size() == 0) {
return Result.success(null, "请求成功");
}
for (int i = 0; i <= ChronoUnit.MONTHS.between(before,now); i++) {
List<JSONObject> videoDataBydDay = adminMapper.statistics3(qw);
for (int i = 0; i <= ChronoUnit.MONTHS.between(before, now); i++) {
LocalDate today = before.plusMonths(i);
JSONObject obj = null;
// Stream<JSONObject> dat1 = videoDataBydDay.stream().filter(x -> LocalDate.parse((CharSequence) x.get("dat"), df) == today);
@ -116,15 +119,12 @@ public class StatisticsController {
break;
}
}
res.add(obj == null ? new JSONObject().fluentPut("dat", today.format(df2)).fluentPut("playNumSum",0).fluentPut("collectionNumSum",0).fluentPut("reSendNumSum",0)
.fluentPut("recommendNumSum",0).fluentPut("commentNumSum",0).fluentPut("commendNumSum",0): obj);
res.add(obj == null ? new JSONObject().fluentPut("dat", today.format(df2)).fluentPut("playNumSum", 0).fluentPut("collectionNumSum", 0).fluentPut("reSendNumSum", 0)
.fluentPut("recommendNumSum", 0).fluentPut("commentNumSum", 0).fluentPut("commendNumSum", 0) : obj);
}
}else {
} else {
qw.between("date_format(creatAt, '%Y-%m-%d')", before, now.plusDays(1));
List<JSONObject> videoDataBydDay = adminMapper.statistics2(qw);
if (videoDataBydDay == null || videoDataBydDay.size() == 0) {
return Result.success(null, "请求成功");
}
for (int i = 0; i <= ChronoUnit.DAYS.between(before, now); i++) {
LocalDate today = before.plusDays(i);
JSONObject obj = null;
@ -135,8 +135,8 @@ public class StatisticsController {
break;
}
}
res.add(obj == null ? new JSONObject().fluentPut("dat", today).fluentPut("playNumSum",0).fluentPut("collectionNumSum",0).fluentPut("reSendNumSum",0)
.fluentPut("recommendNumSum",0).fluentPut("commentNumSum",0).fluentPut("commendNumSum",0) : obj);
res.add(obj == null ? new JSONObject().fluentPut("dat", today).fluentPut("playNumSum", 0).fluentPut("collectionNumSum", 0).fluentPut("reSendNumSum", 0)
.fluentPut("recommendNumSum", 0).fluentPut("commentNumSum", 0).fluentPut("commendNumSum", 0) : obj);
}
}
return Result.success(res, "请求成功");
@ -180,6 +180,7 @@ public class StatisticsController {
}
}
qw.between("createAt", before, now.plusDays(1));
IPage page =(param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg,qw) : userEffectRecordsMapper.rankByUser(pg,qw);
return Result.success(page, "请求成功"); }
IPage page = (param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg, qw) : userEffectRecordsMapper.rankByUser(pg, qw);
return Result.success(page, "请求成功");
}
}

36
src/main/java/com/zh/project0512/utils/RestExceptionHandler.java
Unescape View File

@ -30,55 +30,61 @@ import java.util.stream.Collectors;
public class RestExceptionHandler {
/**
* 默认全局异常处理。
*
* @param e the e
* @return ResultData
*/
@ExceptionHandler(value = {BindException.class, ValidationException.class, MethodArgumentNotValidException.class})
public ResponseEntity<Result<String>> handleValidatedException(Exception e) {
Result<String> result = null;
if (e instanceof MethodArgumentNotValidException) {
MethodArgumentNotValidException ex =(MethodArgumentNotValidException) e;
Result<String> result = null;
if (e instanceof MethodArgumentNotValidException) {
MethodArgumentNotValidException ex = (MethodArgumentNotValidException) e;
result = Result.fail(HttpStatusEnum.BAD_REQUEST,
ex.getBindingResult().getAllErrors().stream()
.map(ObjectError::getDefaultMessage)
.collect(Collectors.joining(";"))
.map(ObjectError::getDefaultMessage)
.collect(Collectors.joining(";"))
);
} else if (e instanceof ConstraintViolationException){
} else if (e instanceof ConstraintViolationException) {
ConstraintViolationException ex = (ConstraintViolationException) e;
result = Result.fail(HttpStatusEnum.BAD_REQUEST,
ex.getConstraintViolations().stream()
.map(ConstraintViolation::getMessage)
.collect(Collectors.joining("; "))
);
}else if (e instanceof BindException) {
BindException ex = (BindException ) e;
} else if (e instanceof BindException) {
BindException ex = (BindException) e;
result = Result.fail(HttpStatusEnum.BAD_REQUEST,
ex.getAllErrors().stream()
.map(ObjectError::getDefaultMessage)
.collect(Collectors.joining("; "))
);
}
return new ResponseEntity<>(result,HttpStatus.BAD_REQUEST);
return new ResponseEntity<>(result, HttpStatus.BAD_REQUEST);
}
@ResponseStatus(HttpStatus.BAD_REQUEST)
// @ResponseStatus(HttpStatus.BAD_REQUEST)
@ExceptionHandler(Exception.class)
@ResponseBody
public Result<String> badRequestExceptionHandler(){
return Result.fail(HttpStatusEnum.BAD_REQUEST);
public Result<String> badRequestExceptionHandler(Exception e) {
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, e.toString()
+ ":error at "
+ e.getStackTrace()[0].getClassName() + "<<Class>>"
+ e.getStackTrace()[0].getMethodName() + "<<method>>"
+ e.getStackTrace()[0].getLineNumber() + "<<lineNumber>>");
}
/**
* 处理自定义的业务异常
*
* @param req 请求
* @param e 异常
* @param e 异常
* @return
*/
@ExceptionHandler(value = BizException.class)
@ResponseBody
public Result<String> bizExceptionHandler(HttpServletRequest req, BizException e){
public Result<String> bizExceptionHandler(HttpServletRequest req, BizException e) {
// log.error("发生业务异常！原因是：{}",e.getMessage());
return Result.fail(e.getCode(),e.getMessage());
return Result.fail(e.getCode(), e.getMessage());
}
}

Write Preview
Loading…
Cancel
Save