From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java | 249 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 238 insertions(+), 11 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 18a3c9b..3bdd45f 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
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -8,10 +10,10 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.modular.system.model.City;
-import com.stylefeng.guns.modular.system.model.TRegion;
-import com.stylefeng.guns.modular.system.service.ICityService;
-import com.stylefeng.guns.modular.system.service.ITRegionService;
+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;
@@ -20,12 +22,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.model.TAdvertisement;
-import com.stylefeng.guns.modular.system.service.ITAdvertisementService;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 广告设置控制器
@@ -45,6 +43,15 @@
@Autowired
private ICityService cityService;
+ @Autowired
+ private ITDriverTeamService itDriverTeamService;
+
+ @Autowired
+ private ITAdvertisementUserService itAdvertisementUserService;
+ @Autowired
+ private ITUserService userService;
+ @Autowired
+ private ITDriverService driverService;
/**
* 跳转到广告设置首页
*/
@@ -52,13 +59,23 @@
public String index() {
return PREFIX + "tAdvertisement.html";
}
-
+ @RequestMapping("user")
+ public String user() {
+ return PREFIX + "tUser.html";
+ }
+ @RequestMapping("driver")
+ public String driver(Model model) {
+ List<TDriverTeam> TDriverTeams=itDriverTeamService.findAllList();
+ model.addAttribute("TDriverTeams",TDriverTeams);
+ return PREFIX + "driver.html";
+ }
/**
* 跳转到添加广告设置
*/
@RequestMapping("/tAdvertisement_add")
public String tAdvertisementAdd(Model model) {
- List<City> list = cityService.selectList(null);
+ List<City> list = cityService.selectList(
+ null);
model.addAttribute("list",list);
return PREFIX + "tAdvertisement_add.html";
}
@@ -107,7 +124,211 @@
tAdvertisementService.insert(tAdvertisement);
return SUCCESS_TIP;
}
+ @RequestMapping(value = "/addInfo1")
+ @ResponseBody
+ public Object add1(String userId,String driverId,String name,String content) {
+ TAdvertisement tAdvertisement = new TAdvertisement();
+ tAdvertisement.setType(4);
+ 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){
+ TAdvertisementUser tAdvertisementUser = new TAdvertisementUser();
+ tAdvertisementUser.setAdvertisementId(tAdvertisement.getId());
+ tAdvertisementUser.setDriverId(driverId);
+ tAdvertisementUser.setUserId(userId);
+ boolean insert1 = itAdvertisementUserService.insert(tAdvertisementUser);
+ // TODO 发送邮件
+ if(insert1){
+ Timer timer = new Timer();
+ timer.schedule(new timerTaskTest(tAdvertisementUser.getId()),30*1000);
+ }
+ }
+ return SUCCESS_TIP;
+ }
+ class timerTaskTest extends TimerTask {
+ private Integer id;
+
+ public timerTaskTest(Integer id) {
+ this.id = id;
+ }
+ @Override
+ public void run() {
+ TAdvertisementUser tAdvertisementUser = itAdvertisementUserService.selectById(id);
+ TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementUser.getAdvertisementId());
+ // 司机所有 TODO
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getDriverId())){
+ System.out.println(1111111111);
+ List<TDriver> list = driverService.selectList(null);
+ for (TDriver tDriver : list) {
+ String email = tDriver.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }else if(ToolUtil.isNotEmpty(tAdvertisementUser.getDriverId())) {
+ JSONArray driverId = JSON.parseArray(tAdvertisementUser.getDriverId());
+ for(int j=0;j<driverId.size();j++){
+ TDriver tDriver = driverService.selectById(driverId.getJSONObject(j).getInteger("userId"));
+ String email = tDriver.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ // 用户所有
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getUserId()) && "[]".equals(tAdvertisementUser.getUserId())){
+ List<TUser> users = userService.selectList(null);
+ for (TUser user : users) {
+ String email = user.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }else if(ToolUtil.isNotEmpty(tAdvertisementUser.getUserId())) {
+ JSONArray driverId = JSON.parseArray(tAdvertisementUser.getUserId());
+ for(int j=0;j<driverId.size();j++){
+ TUser tUser = userService.selectById(driverId.getJSONObject(j).getInteger("userId"));
+ String email = tUser.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+
+ @RequestMapping(value = "/addInfo")
+ @ResponseBody
+ public Object add(String userId,String driverId,String name,String content) {
+ TAdvertisement tAdvertisement = new TAdvertisement();
+ tAdvertisement.setType(3);
+ 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){
+ TAdvertisementUser tAdvertisementUser = new TAdvertisementUser();
+ tAdvertisementUser.setAdvertisementId(tAdvertisement.getId());
+ tAdvertisementUser.setDriverId(driverId);
+ tAdvertisementUser.setUserId(userId);
+ boolean insert1 = itAdvertisementUserService.insert(tAdvertisementUser);
+
+ // TODO 发送邮件
+ if(insert1){
+ Timer timer = new Timer();
+ timer.schedule(new timerTaskTest1(tAdvertisementUser.getId()),30*1000);
+ }
+ }
+ return SUCCESS_TIP;
+ }
+ class timerTaskTest1 extends TimerTask {
+ private Integer id;
+
+ public timerTaskTest1(Integer id) {
+ this.id = id;
+ }
+ @Override
+ public void run() {
+ TAdvertisementUser tAdvertisementUser = itAdvertisementUserService.selectById(id);
+ TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementUser.getAdvertisementId());
+ // 司机所有 TODO
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getDriverId())){
+ List<TDriver> list = driverService.selectList(null);
+ for (TDriver tDriver : list) {
+ String email = tDriver.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getDriverId()) && !"[]".equals(tAdvertisementUser.getDriverId())){
+ JSONArray driverId = JSON.parseArray(tAdvertisementUser.getDriverId());
+ for(int j=0;j<driverId.size();j++){
+ TDriver tDriver = driverService.selectById(driverId.getJSONObject(j).getInteger("userId"));
+ String email = tDriver.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ // 用户所有
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getUserId()) && "[]".equals(tAdvertisementUser.getUserId())){
+ List<TUser> users = userService.selectList(null);
+ for (TUser user : users) {
+ String email = user.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getUserId()) && !"[]".equals(tAdvertisementUser.getUserId())){
+ JSONArray driverId = JSON.parseArray(tAdvertisementUser.getUserId());
+ for(int j=0;j<driverId.size();j++){
+ TUser tUser = userService.selectById(driverId.getJSONObject(j).getInteger("userId"));
+ String email = tUser.getEmail();
+ if(ToolUtil.isNotEmpty(email)){
+ // TODO 发送邮件
+ try {
+ EmailUtil.send(email, tAdvertisement.getName(), tAdvertisement.getContent());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+ }
/**
* 删除广告设置
*/
@@ -144,6 +365,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