Commit e578e6cd authored by hanbing's avatar hanbing

[update] 诊断优化,异常处理

parent 660d4cfc
...@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
...@@ -70,7 +71,7 @@ public class DiagnoController { ...@@ -70,7 +71,7 @@ public class DiagnoController {
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200, message = "OK", response = SchemeOptVO.class), @ApiResponse(code = 200, message = "OK", response = SchemeOptVO.class),
}) })
public JsonViewObject querySchemeOpt(@RequestBody CrossIdDTO crossIdDTO) { public JsonViewObject querySchemeOpt(@RequestBody @Valid CrossIdDTO crossIdDTO) {
SchemeOptVO schemeOptVO = diagnoService.querySchemeOpt(crossIdDTO); SchemeOptVO schemeOptVO = diagnoService.querySchemeOpt(crossIdDTO);
return JsonViewObject.newInstance().success(schemeOptVO); return JsonViewObject.newInstance().success(schemeOptVO);
} }
......
package net.wanji.opt.service.impl; package net.wanji.opt.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -161,6 +162,9 @@ public class DiagnoServiceImpl implements DiagnoService { ...@@ -161,6 +162,9 @@ public class DiagnoServiceImpl implements DiagnoService {
schemeOptVO.setCrossId(crossId); schemeOptVO.setCrossId(crossId);
// 选择数据批次时间最大的记录 // 选择数据批次时间最大的记录
List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId); List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
if (CollectionUtil.isEmpty(maxList)) {
throw new RuntimeException("没有该路口优化日志数据");
}
// 根据相位去重 // 根据相位去重
TreeSet<CrossSchemeOptLogPO> collect = maxList.stream() TreeSet<CrossSchemeOptLogPO> collect = maxList.stream()
.collect(Collectors.toCollection( .collect(Collectors.toCollection(
......
...@@ -3,6 +3,8 @@ package net.wanji.common.dto; ...@@ -3,6 +3,8 @@ package net.wanji.common.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull;
/** /**
* 方案管理-路口配置-获取路口方向列表输入参数 * 方案管理-路口配置-获取路口方向列表输入参数
* *
...@@ -11,6 +13,7 @@ import lombok.Data; ...@@ -11,6 +13,7 @@ import lombok.Data;
*/ */
@Data @Data
public class CrossIdDTO { public class CrossIdDTO {
@ApiModelProperty(value = "路口ID,如:c7e7b1f352dd4acab4a60088eb391cca", required = true) @ApiModelProperty(value = "路口ID", required = true)
@NotNull(message = "路口ID不可为空")
private String crossId; private String crossId;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment