diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java index 2f672a144..ba8019288 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java @@ -120,12 +120,21 @@ public class XzBlindPlatePlugSafeController { if (assignmentPersonInCharge != null) { paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"}; JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList"); List list = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java index 2b5fba06d..f6c1f04d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java @@ -116,12 +116,21 @@ public class XzGroundSafetController { if (jobApplicationUnit != null) { paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param1 = {"name", "flag"}; JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasure = new JSONArray(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java index a8f41d650..49c1b8f82 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java @@ -116,12 +116,21 @@ public class XzHighJobSafeController { if (assignmentPersonInCharge != null) { paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"}; JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList"); List list = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java index fffef1735..7b0772286 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java @@ -116,12 +116,21 @@ public class XzHoistSafetyWorkController { if (assignmentPersonInCharge != null) { paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param1 = {"name", "flag"}; JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasure = new JSONArray(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java index 1c7b80e83..0cf5abe58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java @@ -133,12 +133,21 @@ public class XzLimitSpaceSafeController { // if (acceptTheInformant != null) { // paramMap.put("acceptTheInformant", acceptTheInformant.get(0)); // } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param = {"name", "standard"}; JSONArray toxicAndHarmfulGasInformations = paramMap.getJSONArray("toxicAndHarmfulGasInformation"); JSONArray toxicAndHarmfulGasInformation = new JSONArray(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java index 421846542..15f61e893 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java @@ -114,12 +114,21 @@ public class XzOpenCircuitSafeController { if (jobApplicationUnit != null) { paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param1 = {"name", "flag"}; JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasure = new JSONArray(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java index 7db95f6fc..8a76b3a46 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java @@ -125,12 +125,21 @@ public class XzSpecialOperationFireSafetyController { if (jobApplicationUnit != null) { paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } // JSONArray fireman = paramMap.getJSONArray("fireman"); // if (fireman != null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java index d2447eb33..858111727 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java @@ -112,12 +112,21 @@ public class XzTemporaryElectricitySafeController { if (assignmentPersonInCharge != null) { paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); } - List guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); - paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); - List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); - paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); - List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); - paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); + JSONArray guardianNameArray = paramMap.getJSONArray("guardianName"); + if (guardianNameArray != null) { + List guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class); + paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(","))); + } + JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName"); + if (safetyInformantNameArray != null) { + List safetyInformantName = JSONObject.parseObject(JSON.toJSONString(safetyInformantNameArray), List.class); + paramMap.put("safetyInformantName", safetyInformantName == null ? "" : safetyInformantName.stream().collect(Collectors.joining(","))); + } + JSONArray acceptTheInformantNameArray = paramMap.getJSONArray("acceptTheInformantName"); + if (acceptTheInformantNameArray != null) { + List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); + paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); + } String [] param = {"combustibleGasAnalysis", "analysePlace", "analysePerson"}; JSONArray analyseInfo = paramMap.getJSONArray("analysePlace"); if (analyseInfo != null) {