Commit d645040f authored by 张森's avatar 张森

23922 设备平台卡片测试 / 项目管理-文件下载:上传文件填写的名称存在特殊字符时导致文件无法下载

23887 设备平台卡片测试 / 关键数据-消防水池接口报错
parent 3c9d9886
...@@ -58,10 +58,10 @@ public class FileManageController extends BaseController { ...@@ -58,10 +58,10 @@ public class FileManageController extends BaseController {
} }
@PersonIdentify @PersonIdentify
@RequestMapping(value = "/getFileManageByName", method = RequestMethod.GET) @RequestMapping(value = "/getFileManageByName", method = RequestMethod.POST)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表行点击查看按钮", produces = "application/json;charset=UTF-8", notes = "列表行点击查看按钮") @ApiOperation(httpMethod = "POST", value = "列表行点击查看按钮", produces = "application/json;charset=UTF-8", notes = "列表行点击查看按钮")
public ResponseModel<Page<Map<String, Object>>> getFileManageByName(FileManageDto dto) { public ResponseModel<Page<Map<String, Object>>> getFileManageByName(@RequestBody FileManageDto dto) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
dto.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode()); dto.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
return CommonResponseUtil.success(fileManageService.getFileManageByName(dto)); return CommonResponseUtil.success(fileManageService.getFileManageByName(dto));
......
...@@ -126,10 +126,13 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -126,10 +126,13 @@ public class SupervisionConfigureController extends AbstractBaseController {
for (String pumpDeviceId : pumpDeviceIds) { for (String pumpDeviceId : pumpDeviceIds) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("pumpDeviceId", pumpDeviceId); map.put("pumpDeviceId", pumpDeviceId);
map.put("outputFlowRate", collect.getOrDefault(Long.valueOf(pumpDeviceId), "0")); if (collect.containsKey(Long.valueOf(pumpDeviceId)) && StringUtil.isNotEmpty(collect.get(Long.valueOf(pumpDeviceId)))) {
map.put("outputFlowRate", collect.get(Long.valueOf(pumpDeviceId)));
} else {
map.put("outputFlowRate", 0);
}
info.add(map); info.add(map);
} }
// 按流量排序 // 按流量排序
Collections.sort(info, new Comparator<Map<String, Object>>() { Collections.sort(info, new Comparator<Map<String, Object>>() {
@Override @Override
......
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