admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-06-12 16:10:18 +08:00
commit fb91b3350f
8 changed files with 120 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java
View File

@ -120,12 +120,21 @@ public class XzBlindPlatePlugSafeController {
if (assignmentPersonInCharge != null) { if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"}; String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"};
JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList"); JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList");
List<XzGasAnalyze> list = new ArrayList<>(); List<XzGasAnalyze> list = new ArrayList<>();

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java
View File

@ -116,12 +116,21 @@ public class XzGroundSafetController {
if (jobApplicationUnit != null) { if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param1 = {"name", "flag"}; String [] param1 = {"name", "flag"};
JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure");
JSONArray safeMeasure = new JSONArray(); JSONArray safeMeasure = new JSONArray();

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java
View File

@ -116,12 +116,21 @@ public class XzHighJobSafeController {
if (assignmentPersonInCharge != null) { if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"}; String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"};
JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList"); JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList");
List<XzGasAnalyze> list = new ArrayList<>(); List<XzGasAnalyze> list = new ArrayList<>();

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java
View File

@ -116,12 +116,21 @@ public class XzHoistSafetyWorkController {
if (assignmentPersonInCharge != null) { if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param1 = {"name", "flag"}; String [] param1 = {"name", "flag"};
JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure");
JSONArray safeMeasure = new JSONArray(); JSONArray safeMeasure = new JSONArray();

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java
View File

@ -133,12 +133,21 @@ public class XzLimitSpaceSafeController {
// if (acceptTheInformant != null) { // if (acceptTheInformant != null) {
// paramMap.put("acceptTheInformant", acceptTheInformant.get(0)); // paramMap.put("acceptTheInformant", acceptTheInformant.get(0));
// } // }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param = {"name", "standard"}; String [] param = {"name", "standard"};
JSONArray toxicAndHarmfulGasInformations = paramMap.getJSONArray("toxicAndHarmfulGasInformation"); JSONArray toxicAndHarmfulGasInformations = paramMap.getJSONArray("toxicAndHarmfulGasInformation");
JSONArray toxicAndHarmfulGasInformation = new JSONArray(); JSONArray toxicAndHarmfulGasInformation = new JSONArray();

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java
View File

@ -114,12 +114,21 @@ public class XzOpenCircuitSafeController {
if (jobApplicationUnit != null) { if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param1 = {"name", "flag"}; String [] param1 = {"name", "flag"};
JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure");
JSONArray safeMeasure = new JSONArray(); JSONArray safeMeasure = new JSONArray();

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java
View File

@ -125,12 +125,21 @@ public class XzSpecialOperationFireSafetyController {
if (jobApplicationUnit != null) { if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
// JSONArray fireman = paramMap.getJSONArray("fireman"); // JSONArray fireman = paramMap.getJSONArray("fireman");
// if (fireman != null) { // if (fireman != null) {

21
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java
View File

@ -112,12 +112,21 @@ public class XzTemporaryElectricitySafeController {
if (assignmentPersonInCharge != null) { if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0)); paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
} }
List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("guardianName")), List.class); JSONArray guardianNameArray = paramMap.getJSONArray("guardianName");
paramMap.put("guardianName", guardianName.stream().collect(Collectors.joining(","))); if (guardianNameArray != null) {
List<String> safetyInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("safetyInformantName")), List.class); List<String> guardianName = JSONObject.parseObject(JSON.toJSONString(guardianNameArray), List.class);
paramMap.put("safetyInformantName", safetyInformantName.stream().collect(Collectors.joining(","))); paramMap.put("guardianName", guardianName == null ? "" : guardianName.stream().collect(Collectors.joining(",")));
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(paramMap.getJSONArray("acceptTheInformantName")), List.class); }
paramMap.put("acceptTheInformantName", acceptTheInformantName.stream().collect(Collectors.joining(","))); JSONArray safetyInformantNameArray = paramMap.getJSONArray("safetyInformantName");
if (safetyInformantNameArray != null) {
List<String> 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<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
String [] param = {"combustibleGasAnalysis", "analysePlace", "analysePerson"}; String [] param = {"combustibleGasAnalysis", "analysePlace", "analysePerson"};
JSONArray analyseInfo = paramMap.getJSONArray("analysePlace"); JSONArray analyseInfo = paramMap.getJSONArray("analysePlace");
if (analyseInfo != null) { if (analyseInfo != null) {