feat:

1、处置、撤离日志信息关联预计信息

app/src/main/java/com/yiring/app/domain/risk/RiskHandlePushLog.java

@@ -2,14 +2,12 @@
 package com.yiring.app.domain.risk;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.yiring.app.domain.warningMsg.WarningMessage;
 import com.yiring.auth.domain.user.User;
 import com.yiring.common.domain.BasicEntity;
 import java.io.Serial;
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
@@ -39,6 +37,10 @@ public class RiskHandlePushLog extends BasicEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = -4525914994066766232L;
 
+    @OneToOne
+    @Comment("预警信息")
+    WarningMessage warningMessage;
+
     @ManyToOne
     @Comment("风险推送")
     RiskPush riskPush;

app/src/main/java/com/yiring/app/domain/risk/RiskWithdrawalPushLog.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.domain.risk;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.yiring.app.domain.warningMsg.WarningMessage;
+import com.yiring.auth.domain.user.User;
+import com.yiring.common.domain.BasicEntity;
+import java.io.Serial;
+import java.io.Serializable;
+import javax.persistence.*;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.Comment;
+
+/**
+ * 风险处置推送日志
+ *
+ * @author LJ-2204
+ * @date 2022/5/23
+ */
+
+@Getter
+@Setter
+@ToString
+@SuperBuilder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Entity
+@Table(name = "BS_RISK_WITHDRAWAL_PUSH_LOG")
+@Comment("风险处置推送日志")
+public class RiskWithdrawalPushLog extends BasicEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 3245051209143173609L;
+
+    @OneToOne
+    @Comment("预警信息")
+    WarningMessage warningMessage;
+
+    @ManyToOne
+    @Comment("风险推送")
+    RiskPush riskPush;
+
+    @Comment("通知方式")
+    String types;
+
+    @Comment("接收状态")
+    Boolean status;
+
+    @ManyToOne
+    @JoinColumn(name = "leader_id")
+    @JsonIgnore
+    @Comment("负责人")
+    User user;
+}

app/src/main/java/com/yiring/app/domain/risk/RiskWithdrawalPushLogRepository.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.domain.risk;
+
+import java.io.Serializable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * @author LJ-2204
+ * @date 2022/5/23
+ */
+
+@Repository
+public interface RiskWithdrawalPushLogRepository
+    extends JpaRepository<RiskWithdrawalPushLog, Serializable>, JpaSpecificationExecutor<RiskWithdrawalPushLog> {}

app/src/main/java/com/yiring/app/service/message/impl/PositionMessageServiceImpl.java

@@ -17,6 +17,7 @@ import com.yiring.app.domain.log.ZyRealtimeLogRepository;
 import com.yiring.app.domain.risk.*;
 import com.yiring.app.domain.warningMsg.WarningMessage;
 import com.yiring.app.domain.warningMsg.WarningMessageRepository;
+import com.yiring.app.domain.workArea.WorkArea;
 import com.yiring.app.param.key.KeyAlarmAddParam;
 import com.yiring.app.push.domain.PushMessage;
 import com.yiring.app.service.message.PositionMessageService;
@@ -38,6 +39,7 @@ import javax.annotation.Resource;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Predicate;
 import lombok.extern.slf4j.Slf4j;
+import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.Point;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.*;
@@ -109,6 +111,12 @@ public class PositionMessageServiceImpl implements PositionMessageService {
     @Resource
     RiskPushRepository riskPushRepository;
 
+    @Resource
+    RiskWithdrawalPushRepository riskWithdrawalPushRepository;
+
+    @Resource
+    RiskWithdrawalPushLogRepository riskWithdrawalPushLogRepository;
+
     @Override
     public void consume(String message) {
         // 将消息转换成 JSON 格式
@@ -750,9 +758,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
             .build();
         riskMeterDetectRepository.save(riskMeterDetect);
 
-        // 撤离推送
-
-        // 处置推送
+        // 撤离推送数据
         Optional<RiskPush> riskPushOptional = riskPushRepository.findOne(
             Example.of(RiskPush.builder().workArea(riskWarn.getWorkArea()).level(riskWarn.getRiskLevel()).build())
         );
@@ -763,6 +769,44 @@ public class PositionMessageServiceImpl implements PositionMessageService {
 
         RiskPush riskPush = riskPushOptional.get();
 
+        // 撤离推送
+        List<RiskWithdrawalPush> riskWithdrawalPushes = riskWithdrawalPushRepository.findAll(
+            Example.of(RiskWithdrawalPush.builder().riskPush(riskPush).build())
+        );
+
+        // 获取工区位置
+        WorkArea workArea = riskPush.getWorkArea();
+        Geometry geometry = workArea.getGeometry();
+
+        // 获取处在工区范围的人员并进行推送
+        for (RiskWithdrawalPush riskWithdrawalPush : riskWithdrawalPushes) {
+            List<LocationTag> locationTags = locationTagRepository.findInArea(
+                GeoUtils.expandGeometry(geometry, Convert.toInt(riskWithdrawalPush.getScope()))
+            );
+            String[] split = riskWithdrawalPush.getTypes().split(",");
+            for (String s : split) {
+                for (LocationTag locationTag : locationTags) {
+                    Boolean status = false;
+                    User user = locationTag.getUser();
+                    switch (PushMessage.Type.valueOf(s)) {
+                        case APP -> log.info("APP 信息发送中---");
+                        case SMS -> log.info("SMS 信息发送中---");
+                        case EMAIL -> log.info("EMAIL 信息发送中---");
+                    }
+                    RiskWithdrawalPushLog riskWithdrawalPushLog = RiskWithdrawalPushLog
+                        .builder()
+                        .riskPush(riskPush)
+                        .types(s)
+                        .warningMessage(warningMessage)
+                        .user(user)
+                        .status(status)
+                        .build();
+                    riskWithdrawalPushLogRepository.save(riskWithdrawalPushLog);
+                }
+            }
+        }
+
+        // 处置推送
         long between = LocalDateTimeUtil.between(
             warningMessage.getCreateTime(),
             warningMessage.getUpdateTime(),
@@ -800,6 +844,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
                     .builder()
                     .riskPush(riskPush)
                     .types(s)
+                    .warningMessage(warningMessage)
                     .user(user)
                     .status(status)
                     .build();