Commit d0db343d authored by 刘林's avatar 刘林

fix(jg):管道合并get请求体超长问题处理

parent 8bc5d3a3
......@@ -182,11 +182,11 @@ public class JgInstallationNoticeController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询工程装置下的所有未做安装告知、不在安装告知流程、安装告知作废的设备",
@ApiOperation(httpMethod = "POST", value = "查询工程装置下的所有未做安装告知、不在安装告知流程、安装告知作废的设备",
notes = "查询工程装置下的所有未做安装告知、不在安装告知流程、安装告知作废的设备")
@GetMapping(value = "/getDeviceListByProjectContraptionSeq")
public ResponseModel<Object> getDeviceListByProjectContraption(@RequestParam Map<String, Object> params) {
String projectContraptionSeq = ValidationUtil.isEmpty(params.get("sequenceNbr")) ? String.valueOf(params.get("record")) : params.get("sequenceNbr").toString();
@PostMapping(value = "/getDeviceListByProjectContraptionSeq")
public ResponseModel<Object> getDeviceListByProjectContraption(@RequestBody JSONObject map) {
String projectContraptionSeq = ValidationUtil.isEmpty(map.get("sequenceNbr")) ? String.valueOf(map.get("record")) : map.get("sequenceNbr").toString();
return ResponseHelper.buildResponse(iJgInstallationNoticeService.getDeviceListByProjectContraption(projectContraptionSeq));
}
......
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -173,8 +174,8 @@ public class JgUseRegistrationController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
@GetMapping(value = "/getDetail")
@ApiOperation(httpMethod = "POST", value = "详情", notes = "详情")
@PostMapping(value = "/getDetail")
public ResponseModel<Map<String, Object>> getDetail(@RequestParam(value = "record", required = false) String record,
@RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record, sequenceNbr, getSelectedOrgInfo()));
......@@ -393,10 +394,12 @@ public class JgUseRegistrationController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询工程装置下的所有做过安装告知但是为做使用登记的管道", notes = "查询工程装置下的所有做过安装告知但是为做使用登记的管道")
@GetMapping(value = "/getDeviceListByProjectContraptionSeq")
public ResponseModel<Object> getDeviceListByProjectContraption(@RequestParam("record") String projectContraptionSeq,
@RequestParam("originProjectContraptionIds") String[] originProjectContraptionIds) {
@ApiOperation(httpMethod = "POST",value = "查询工程装置下的所有做过安装告知但是未做使用登记的管道",notes = "查询工程装置下的所有做过安装告知但是未做使用登记的管道")
@PostMapping(value = "/getDeviceListByProjectContraptionSeq")
public ResponseModel<Object> getDeviceListByProjectContraption(@RequestBody JSONObject map) {
String projectContraptionSeq = map.getString("record");
JSONArray idsArray = map.getJSONArray("originProjectContraptionIds");
String[] originProjectContraptionIds = idsArray.toArray(new String[0]);
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDeviceListByProjectContraption(projectContraptionSeq, originProjectContraptionIds));
}
......
......@@ -4960,7 +4960,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
item.put("inspectReport", JSON.parse(item.get("inspectReport").toString()));
});
// 根据设备判断工程装置安装位置是否西咸
String isXixian = Optional.ofNullable(equList.get(0))
String isXixian = equList.isEmpty()? "0": Optional.ofNullable(equList.get(0))
.map(equ -> equ.get("record"))
.map(String::valueOf)
.flatMap(recordStr -> Optional.ofNullable(idxBizJgUseInfoService.getOneData(recordStr)))
......
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