diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index 38aedfd10..a3f841673 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -396,6 +396,9 @@ public class WorkerInfo implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "证书等生效时间截止时间") private String effectTime; + @TableField(exist = false) + @ApiModelProperty(value = "动火证编号") + private String fireCertificate; /** * 通知的人员id */ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 78518254a..ff1151411 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -196,6 +196,14 @@ public class WorkerInfoServiceImpl extends ServiceImpl workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList()); + List workerCertificate = workerCertificateService.list(Wrappers.lambdaQuery() + .in(WorkerCertificate::getWorkerId, workerIds) + .eq(WorkerCertificate::getCertificateType, 45)); + for (WorkerInfo workerInfo : list) { + List collect = workerCertificate.stream().filter(w -> w.getWorkerId().toString().equals(workerInfo.getId().toString())).collect(Collectors.toList()); + workerInfo.setFireCertificate(collect.size() > 0 ? collect.get(0).getCertificateNumber() : ""); + } return page.setRecords(list); } 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 7f83e06ff..f5c5dbc68 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 @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.controller; +import com.alibaba.fastjson.JSONObject; import com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe; import com.zhgd.xmgl.modules.xz.special.service.IXzBlindPlatePlugSafeService; import io.swagger.annotations.Api; @@ -78,6 +79,19 @@ public class XzBlindPlatePlugSafeController { return Result.ok(); } + /** + * 添加 + * + * @param paramMap + * @return + */ + @ApiOperation(value = "添加星纵-盲板抽堵安全信息", notes = "添加星纵-盲板抽堵安全信息", httpMethod = "POST") + @PostMapping(value = "/save") + public Result save(@RequestBody JSONObject paramMap) { + log.info("盲板抽堵信息同步" + paramMap); + return Result.ok(); + } + /** * 编辑 * 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 a030c44a7..885f90ee4 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 @@ -181,6 +181,39 @@ public class XzLimitSpaceSafeController { } } paramMap.put("gasAnalysisData", JSON.toJSONString(gasAnalysisData)); + + String [] param2 = {"name", "flag"}; + JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); + JSONArray safeMeasure = new JSONArray(); + if (safeMeasures != null) { + for (int i = 0; i < safeMeasures.size(); i++) { + JSONObject detailObj = new JSONObject(); + JSONObject j = safeMeasures.getJSONObject(i); + int k = 0; + for (String s : j.keySet()) { + detailObj.put(param2[k], j.get(s)); + k++; + } + safeMeasure.add(detailObj); + } + } + paramMap.put("safeMeasure", JSON.toJSONString(safeMeasure)); + String [] param3 = {"content", "person"}; + JSONArray otherSafeMeasures = paramMap.getJSONArray("otherSafeMeasure"); + JSONArray otherSafeMeasure = new JSONArray(); + if (otherSafeMeasures != null) { + for (int i = 0; i < otherSafeMeasures.size(); i++) { + JSONObject detailObj = new JSONObject(); + JSONObject j = otherSafeMeasures.getJSONObject(i); + int k = 0; + for (String s : j.keySet()) { + detailObj.put(param3[k], j.get(s)); + k++; + } + otherSafeMeasure.add(detailObj); + } + } + paramMap.put("otherSafeMeasure", JSON.toJSONString(otherSafeMeasure)); xzLimitSpaceSafeService.add(JSONObject.parseObject(JSON.toJSONString(paramMap), XzLimitSpaceSafe.class)); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 9c4a585aa..0e8ca4998 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -370,6 +370,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/xzSpecialOperationFireSafety/save").permitAll() .antMatchers("/xmgl/xzLimitSpaceSafe/save").permitAll() .antMatchers("/xmgl/workerCertificate/queryByType").permitAll() + .antMatchers("/xmgl/xzBlindPlatePlugSafe/save").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()