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-18 11:22:36 +08:00
commit bf37109c54
5 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,11 @@ public class XzBlindPlatePlugSafeController {
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName");
if (jobPersonNameArray != null) {
List<String> jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class);
paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(",")));
}
String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"};
JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList");
List<XzGasAnalyze> list = new ArrayList<>();

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

@ -131,6 +131,11 @@ public class XzHighJobSafeController {
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName");
if (jobPersonNameArray != null) {
List<String> jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class);
paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(",")));
}
String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"};
JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList");
List<XzGasAnalyze> list = new ArrayList<>();

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

@ -131,6 +131,21 @@ public class XzHoistSafetyWorkController {
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
JSONArray hoistJobPersonNameArray = paramMap.getJSONArray("hoistJobPersonName");
if (hoistJobPersonNameArray != null) {
List<String> hoistJobPersonName = JSONObject.parseObject(JSON.toJSONString(hoistJobPersonNameArray), List.class);
paramMap.put("hoistJobPersonName", hoistJobPersonName == null ? "" : hoistJobPersonName.stream().collect(Collectors.joining(",")));
}
JSONArray siSuoPersonNameArray = paramMap.getJSONArray("siSuoPersonName");
if (siSuoPersonNameArray != null) {
List<String> siSuoPersonName = JSONObject.parseObject(JSON.toJSONString(siSuoPersonNameArray), List.class);
paramMap.put("siSuoPersonName", siSuoPersonName == null ? "" : siSuoPersonName.stream().collect(Collectors.joining(",")));
}
JSONArray commanderArray = paramMap.getJSONArray("commander");
if (commanderArray != null) {
List<String> commander = JSONObject.parseObject(JSON.toJSONString(commanderArray), List.class);
paramMap.put("commander", commander == null ? "" : commander.stream().collect(Collectors.joining(",")));
}
String [] param1 = {"name", "flag"};
JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure");
JSONArray safeMeasure = new JSONArray();

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

@ -148,6 +148,11 @@ public class XzLimitSpaceSafeController {
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName");
if (jobPersonNameArray != null) {
List<String> jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class);
paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(",")));
}
String [] param = {"name", "standard"};
JSONArray toxicAndHarmfulGasInformations = paramMap.getJSONArray("toxicAndHarmfulGasInformation");
JSONArray toxicAndHarmfulGasInformation = new JSONArray();

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

@ -127,6 +127,16 @@ public class XzTemporaryElectricitySafeController {
List<String> acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class);
paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(",")));
}
JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName");
if (jobPersonNameArray != null) {
List<String> jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class);
paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(",")));
}
JSONArray electricityCustomerNameArray = paramMap.getJSONArray("electricityCustomerName");
if (electricityCustomerNameArray != null) {
List<String> electricityCustomerName = JSONObject.parseObject(JSON.toJSONString(electricityCustomerNameArray), List.class);
paramMap.put("electricityCustomerName", electricityCustomerName == null ? "" : electricityCustomerName.stream().collect(Collectors.joining(",")));
}
String [] param = {"combustibleGasAnalysis", "analysePlace", "analysePerson"};
JSONArray analyseInfo = paramMap.getJSONArray("analysePlace");
if (analyseInfo != null) {