From 9ed55a826149f31be82b32ae7e230e6636c9df67 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Thu, 16 May 2024 16:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...AnalyseHardWareAlarmRecordServiceImpl.java |  3 +++
 .../WorkerCertificateController.java          | 21 +++++++++++++++++++
 ...zSpecialOperationFireSafetyController.java | 16 ++++++++++++++
 .../zhgd/xmgl/security/WebSecurityConfig.java |  1 +
 4 files changed, 41 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
index 6b76df933..ec6739799 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
@@ -624,6 +624,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
             BigDecimal subtract = bigDecimal1.subtract(bigDecimal);
             subtract = subtract.divide(bigDecimal, 2, BigDecimal.ROUND_HALF_UP);
             BigDecimal subtract1 = bigDecimal2.subtract(subtract);
+            if(subtract1.compareTo(new BigDecimal(0))  < 0) {
+                return new BigDecimal(0);
+            }
             return subtract1.multiply(new BigDecimal(20)).setScale(2, RoundingMode.HALF_UP);
         }
         return new BigDecimal(20);
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java
index 5e2539e4b..f306c8b46 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.worker.controller;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
@@ -151,4 +152,24 @@ public class WorkerCertificateController {
         return Result.success(workerCertificateService.selectProjectManageCertificateTotal(map));
     }
 
+    /**
+     * 通过id查询
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "通过id查询人员证书表信息", notes = "通过id查询人员证书表信息", httpMethod = "POST")
+    @PostMapping(value = "/queryByType")
+    public Result<List<WorkerCertificate>> queryByType(@RequestBody Map<String, Object> map) {
+        Result<List<WorkerCertificate>> result = new Result<List<WorkerCertificate>>();
+        String workerId = MapUtils.getString(map, "workerId");
+        Integer certificateType = MapUtils.getInteger(map, "certificateType");
+        List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
+                .eq(WorkerCertificate::getWorkerId, workerId)
+                .eq(WorkerCertificate::getCertificateType, certificateType));
+        result.setResult(workerCertificate);
+        result.setSuccess(true);
+        return result;
+    }
+
 }
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 ddcc4efd2..46ca62a36 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
@@ -169,6 +169,22 @@ public class XzSpecialOperationFireSafetyController {
 			}
 		}
 		paramMap.put("safeMeasure", JSON.toJSONString(safeMeasure));
+		String [] param2 = {"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(param2[k], j.get(s));
+					k++;
+				}
+				otherSafeMeasure.add(detailObj);
+			}
+		}
+		paramMap.put("otherSafeMeasure", JSON.toJSONString(otherSafeMeasure));
 		XzSpecialOperationFireSafety xzSpecialOperationFireSafety = JSONObject.parseObject(JSON.toJSONString(paramMap), XzSpecialOperationFireSafety.class);
 		xzSpecialOperationFireSafety.setXzGasAnalyzeList(list);
 		xzSpecialOperationFireSafetyService.add(xzSpecialOperationFireSafety);
diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
index b6546d83a..9c4a585aa 100644
--- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
+++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
@@ -369,6 +369,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/xzWorkerInfoAuditRecord/viewWorkerInfoDetail").permitAll()
                     .antMatchers("/xmgl/xzSpecialOperationFireSafety/save").permitAll()
                     .antMatchers("/xmgl/xzLimitSpaceSafe/save").permitAll()
+                    .antMatchers("/xmgl/workerCertificate/queryByType").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证.
                     .and()