Browse Source

fix:bug

release-sy-v1.0.0
“lyd” 2 weeks ago
parent
commit
6b892d3958
  1. 5
      shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java
  2. 3
      shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

5
shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java

@ -43,6 +43,11 @@ public class MonitorQueDto {
@JSONField(name = "MPCD")
private String mpcd;
@JSONField(name = "PRJ_STCD")
@ApiModelProperty(value = "测站编码 针对ms_dsm_xx 这个一类表")
private String prjStcd;
@JSONField(name = "START_TIME", format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@NotNull(message = "开始时间不能为空")

3
shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

@ -220,6 +220,8 @@ public class MonitorService {
public <T> IPage<T> queryDataPage(MonitorSourceEnum source, MonitorQueDto queDto) {
MonitorSourceEnum.ResultWrapper resultWrapper = new MonitorSourceEnum.ResultWrapper();
resultWrapper.setQueDto(queDto);
// ms_dsm_xx入参是使用的 prjStcd 这边我做一下简单的兜底
queDto.setPrjStcd(queDto.getStcd());
String path = paths.get(source.getTableName());
if (path == null) {
resultWrapper.setResultJson(source.getMockData());
@ -230,6 +232,7 @@ public class MonitorService {
String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto);
resultWrapper.setResultJson(json);
log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json);
log.debug("queryDataPagePreTableName:{}", source.getTableName() + JSON.toJSONString(queDto));
return (IPage<T>) source.getRecords().apply(resultWrapper);
}

Loading…
Cancel
Save