From 521efb9bc33d52ef4772f0b30f8a371ba4b0070c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 二月 2023 19:09:42 +0800
Subject: [PATCH] 更新最新代码
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
index a51291f..2d949fb 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
@@ -13,6 +13,7 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.EmailUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -47,8 +48,6 @@
@Autowired
private ITAdvertisementUserService itAdvertisementUserService;
- @Autowired
- private ITAdvertisementInformService itAdvertisementInformService;
@Autowired
private ITUserService userService;
@Autowired
@@ -133,14 +132,20 @@
tAdvertisement.setName(name);
tAdvertisement.setInsertTime(new Date());
tAdvertisement.setInsertUser(ShiroKit.getUser().getId());
+
+ content = content.replaceAll("& lt;", "<");
+ content = content.replaceAll("& gt;", ">");
+ content = content.replaceAll("& #40;", "(");
+ content = content.replaceAll("& #41;", ")");
+
tAdvertisement.setContent(content);
boolean insert = tAdvertisementService.insert(tAdvertisement);
if(insert){
- TAdvertisementInform tAdvertisementUser = new TAdvertisementInform();
+ TAdvertisementUser tAdvertisementUser = new TAdvertisementUser();
tAdvertisementUser.setAdvertisementId(tAdvertisement.getId());
tAdvertisementUser.setDriverId(driverId);
tAdvertisementUser.setUserId(userId);
- boolean insert1 = itAdvertisementInformService.insert(tAdvertisementUser);
+ boolean insert1 = itAdvertisementUserService.insert(tAdvertisementUser);
// TODO 发送邮件
if(insert1){
Timer timer = new Timer();
@@ -157,7 +162,8 @@
}
@Override
public void run() {
- TAdvertisementInform tAdvertisementUser = itAdvertisementInformService.selectById(id);
+ TAdvertisementUser tAdvertisementUser = itAdvertisementUserService.selectById(id);
+ TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementUser.getAdvertisementId());
// 司机所有 TODO
if("[]".equals(tAdvertisementUser.getDriverId())){
System.out.println(1111111111);
@@ -166,6 +172,11 @@
String email = tDriver.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}else {
@@ -175,6 +186,11 @@
String email = tDriver.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}
@@ -185,6 +201,11 @@
String email = user.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}else {
@@ -194,6 +215,11 @@
String email = tUser.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}
@@ -210,6 +236,10 @@
tAdvertisement.setName(name);
tAdvertisement.setInsertTime(new Date());
tAdvertisement.setInsertUser(ShiroKit.getUser().getId());
+ content = content.replaceAll("& lt;", "<");
+ content = content.replaceAll("& gt;", ">");
+ content = content.replaceAll("& #40;", "(");
+ content = content.replaceAll("& #41;", ")");
tAdvertisement.setContent(content);
boolean insert = tAdvertisementService.insert(tAdvertisement);
if(insert){
@@ -236,6 +266,7 @@
@Override
public void run() {
TAdvertisementUser tAdvertisementUser = itAdvertisementUserService.selectById(id);
+ TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementUser.getAdvertisementId());
// 司机所有 TODO
if("[]".equals(tAdvertisementUser.getDriverId())){
List<TDriver> list = driverService.selectList(null);
@@ -243,6 +274,11 @@
String email = tDriver.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}else {
@@ -252,6 +288,11 @@
String email = tDriver.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}
@@ -262,6 +303,11 @@
String email = user.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}else {
@@ -271,6 +317,11 @@
String email = tUser.getEmail();
if(ToolUtil.isNotEmpty(email)){
// TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
}
@@ -313,6 +364,12 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TAdvertisement tAdvertisement) {
+ String content = tAdvertisement.getContent();
+ content = content.replaceAll("& lt;", "<");
+ content = content.replaceAll("& gt;", ">");
+ content = content.replaceAll("& #40;", "(");
+ content = content.replaceAll("& #41;", ")");
+ tAdvertisement.setContent(content);
tAdvertisement.setUpdateTime(new Date());
tAdvertisement.setUpdateUser(ShiroKit.getUser().getId());
tAdvertisementService.updateById(tAdvertisement);
--
Gitblit v1.7.1