Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTrave...

luo

2024-01-31 021640e69b32dbd9b88a538402671c47f280df9e

 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,43 +162,64 @@
        }
        @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())){
            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 {
            }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("[]".equals(tAdvertisementUser.getUserId())){
            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 {
            }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();
                        }
                    }
                }
            }
@@ -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,45 +266,67 @@
        @Override
        public void run() {
            TAdvertisementUser tAdvertisementUser = itAdvertisementUserService.selectById(id);
            TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementUser.getAdvertisementId());
            // 司机所有 TODO
            if("[]".equals(tAdvertisementUser.getDriverId())){
            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();
                        }
                    }
                }
            }else {
            }
            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("[]".equals(tAdvertisementUser.getUserId())){
            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()) && !"[]".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();
                        }
                    }
                }
            }

        }
    }
    /**
@@ -313,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);