Browse Source

fix: bug修复

release-sy-v1.0.0
hxh 4 weeks ago
parent
commit
ea79808837
  1. 4
      shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java
  2. 2
      shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java
  3. 6
      shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java
  4. 4
      shuili-system/src/main/java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java

4
shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java

@ -58,8 +58,8 @@ public enum MonitorSourceEnum {
DWS_ATT_DAM_RSPP("大坝特征值表", MonitorTypeEnum.DATA, DwsAttDamRspp.class),
DWS_REL_ST_RES("水库测站关系表", MonitorTypeEnum.DATA, SkRelStRes.class),
DWS_REL_WAGA_RES("水库水闸关系表", MonitorTypeEnum.DATA, SzDwsRelWagaRes.class),
MS_HPM_GATE("闸门开度监测表", MonitorTypeEnum.DATA, MsHpmGate.class),
MS_WQM_WQAMD("水质自动监测数据表", MonitorTypeEnum.DATA, MsWqmWqamd.class),
MS_HPM_GATE("闸门开度监测表", MsHpmGate.class),
MS_WQM_WQAMD("水质自动监测数据表", MsWqmWqamd.class),
;
private final String zhName;

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

@ -211,7 +211,7 @@ public class MonitorService {
}
String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto);
resultWrapper.setResultJson(json);
// log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json);
log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json);
return (IPage<T>) source.getRecords().apply(resultWrapper);
}

6
shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java

@ -62,9 +62,9 @@ public class AttResBaseSkController extends BaseController {
return AjaxResult.success(attResCodeService.getById(id));
}
@GetMapping("/waga/{resCodee}")
@GetMapping("/waga/{resCode}")
@ApiOperation("水库有水闸")
public Response<List<Object>> wagaForRes(@RequestParam("resCode") String resCode) {
public Response<List<Object>> wagaForRes(@PathVariable("resCode") String resCode) {
MonitorQueDto dto = new MonitorQueDto();
dto.setResCode(resCode);
dto.setPageNum(1);
@ -75,7 +75,7 @@ public class AttResBaseSkController extends BaseController {
@GetMapping("/stcd/all/{resCode}")
@ApiOperation("水库所有测站")
public Response<List<Object>> ForRes(@RequestParam("resCode") String resCode) {
public Response<List<Object>> ForRes(@PathVariable("resCode") String resCode) {
MonitorQueDto dto = new MonitorQueDto();
dto.setResCode(resCode);
dto.setPageNum(1);

4
shuili-system/src/main/java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java

@ -53,14 +53,14 @@ public class DataCenterRestTemplateUtils {
*/
public String doPostRequest(String url, Object request) {
String requestStr = JSONObject.toJSONString(request);
log.info("请求接口:{}, 请求报文:{}", url, requestStr);
log.debug("请求接口:{}, 请求报文:{}", url, requestStr);
HttpHeaders headers = getHttpHeaders();
HttpEntity<String> httpEntity = new HttpEntity<>(requestStr, headers);
String seqResult = "";
try {
ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
seqResult = responseEntity.getBody();
log.info("请求接口:{}, 请求报文:{}, 返回报文:{}", url, requestStr, seqResult);
log.debug("请求接口:{}, 请求报文:{}, 返回报文:{}", url, requestStr, seqResult);
} catch (Exception e) {
log.error("请求接口:{},返回异常", url, e);
}

Loading…
Cancel
Save