From a4804c6324b27f5cce636380909dba32dfe9227a Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Fri, 19 May 2023 10:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E5=8F=91?=
=?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/kening/vordm/entity/DisasterInfo.java | 6 ++++
.../controller/DisasterInfoController.java | 28 ++++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
index b749a24..bf7da7c 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
@@ -164,4 +164,10 @@ public class DisasterInfo implements Serializable {
*/
private Date respondedTime;
+ /**
+ * Allocation 是否是分配
+ */
+ @TableField(exist = false)
+ private String allocation;
+
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index 6cc27db..70229bb 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -23,6 +23,7 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
@@ -344,7 +345,7 @@ public class DisasterInfoController {
Boolean flag = disasterInfoService.updateById(disasterInfo);
return R.data(flag);
}
-
+ private final EmailService emailService;
@ApiOperationSupport(order = 6)
@ApiOperation(value = "提交", notes = "传入Tool")
@PostMapping("/submit")
@@ -355,6 +356,31 @@ public class DisasterInfoController {
one.setStatus(1);
one.setManagerId(disasterInfo.getChiefId());
guestManageDisasterRefService.updateById(one);
+ //判断是否是分配
+ String Allocation = disasterInfo.getAllocation();
+ if(!StringUtil.isEmpty(Allocation)){
+ GuestInfo user = guestInfoService.getById(disasterInfo.getChiefId());
+ //发送邮件
+ Email email = new Email();
+ email.setSubject("You have a new pending disaster");
+ String text ="Disaster Keyword:" + disasterInfo.getDisasterKeyword()+"
";
+ text+= "Disaster Time:" + disasterInfo.getDisasterTime()+"
";
+ //disaster_country
+ text+= "Disaster Country:" + disasterInfo.getDisasterCountry()+"
";
+ //vordm_id
+ text+= "VORDM ID:" + disasterInfo.getVordmId()+"
";
+
+ email.setText(text);
+ String [] to = new String[]{user.getEmail()};
+ email.setTos(to);
+ email.setHtmlText(true);
+ try {
+ emailService.sendMimeMessage(email);
+ } catch (Exception e) {
+ return R.fail("发送失败");
+ }
+
+ }
return R.status(disasterInfoService.saveOrUpdate(disasterInfo));
}