Merge pull request #1229 from dataease/pr@dev@feat_chrome_screenshot

backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -21,6 +21,12 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.1.1-jre</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -201,7 +207,7 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -244,6 +250,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

backend/src/main/java/io/dataease/commons/utils/WebDriverUtils.java

+package io.dataease.commons.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeDriverService;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.Augmenter;
+import org.springframework.core.env.Environment;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+
+/**
+ * 打印浏览器
+ */
+public class WebDriverUtils {
+
+    private static String driverPath;
+
+
+    public static void print(String url, String filePath) {
+
+        try {
+            url = URLDecoder.decode(url, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        if (StringUtils.isBlank(driverPath)) {
+            driverPath = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.chrome-driver-path", String.class, "/usr/bin/chromedriver");
+        }
+
+        String driverPath = "/usr/local/sbin/chromedriver";
+        ChromeOptions options = new ChromeOptions();
+        options.addArguments("headless");
+        options.addArguments("no-sandbox");
+        options.addArguments("disable-gpu");
+        options.addArguments("disable-features=NetworkService");
+        options.addArguments("ignore-certificate-errors");
+        options.addArguments("silent-launch");
+        options.addArguments("disable-application-cache");
+        options.addArguments("disable-web-security");
+        options.addArguments("no-proxy-server");
+        options.addArguments("disable-dev-shm-usage");
+
+        WebDriver driver = null;
+
+        try {
+            System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, driverPath);
+            driver = new ChromeDriver(options);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        driver.get(url);
+        WebDriver augmentedDriver = new Augmenter().augment(driver);
+        File screenshot = ((TakesScreenshot) augmentedDriver) .getScreenshotAs(OutputType.FILE);
+
+        File file = new File(filePath);
+        copy(screenshot, file);
+        driver.quit();
+    }
+
+    private static void copy(File src, File dest) {
+        try
+        {
+            FileInputStream fis = new FileInputStream(src);//创建输入流对象
+            FileOutputStream fos = new FileOutputStream(dest); //创建输出流对象
+            byte datas[] = new byte[1024*8];//创建搬运工具
+            int len = 0;//创建长度
+            while((len = fis.read(datas))!=-1)//循环读取数据
+            {
+                fos.write(datas,0,len);
+            }
+            fis.close();//释放资源
+            fis.close();//释放资源
+        } catch (Exception e){
+
+            e.printStackTrace();
+        }
+
+    }
+}

backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java

@@ -415,4 +415,8 @@ public class ScheduleManager {
         scheduler.triggerJob(jobKey);
     }
 
+    public void fireNow(JobKey jobKey) throws SchedulerException {
+        scheduler.triggerJob(jobKey);
+    }
+
 }

backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java

+package io.dataease.job.sechedule.strategy;
+
+import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import org.apache.commons.lang3.ObjectUtils;
+import org.quartz.*;
+import org.springframework.beans.factory.InitializingBean;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public abstract class TaskHandler implements InitializingBean {
+
+    private static final String[] week = {"SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY"};
+
+
+    public void addTask(ScheduleManager scheduleManager, GlobalTaskEntity taskEntity) throws Exception {
+        // 1。首先看看是否过期
+        Long endTime = taskEntity.getEndTime();
+        if (taskExpire(endTime)) { // 过期了就删除任务
+            removeTask(scheduleManager, taskEntity);
+            return;
+        }
+        JobKey jobKey = new JobKey(taskEntity.getTaskId().toString());
+        TriggerKey triggerKey = new TriggerKey(taskEntity.getTaskId().toString());
+        Date start = new Date(taskEntity.getStartTime());
+        Date end = null;
+        if (ObjectUtils.isNotEmpty(taskEntity.getEndTime())) {
+            new Date(taskEntity.getEndTime());
+        }
+        Class executor = this.getClass();
+        String cron = cron(taskEntity);
+        scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, executor , cron, start, end, jobDataMap(taskEntity));
+    }
+
+
+    protected abstract JobDataMap jobDataMap( GlobalTaskEntity taskEntity);
+
+    private String cron(GlobalTaskEntity taskEntity) {
+        if(taskEntity.getRateType() == -1) {
+            return taskEntity.getRateVal();
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
+
+        Date date = null;
+        try {
+            date = sdf.parse(taskEntity.getRateVal());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Calendar instance = Calendar.getInstance();
+        instance.setTime(date);
+
+        if (taskEntity.getRateType() == 0) {
+            return
+                    instance.get(Calendar.SECOND) + " " +
+                    instance.get(Calendar.MINUTE) + " " +
+                    instance.get(Calendar.HOUR_OF_DAY) + " * * ?";
+        }
+        if (taskEntity.getRateType() == 1) {
+            return
+                    instance.get(Calendar.SECOND) + " " +
+                    instance.get(Calendar.MINUTE) + " " +
+                    instance.get(Calendar.HOUR_OF_DAY) + " ? * " +
+                    getDayOfWeek(instance);
+        }
+        if (taskEntity.getRateType() == 2) {
+            return
+                    instance.get(Calendar.SECOND) + " " +
+                    instance.get(Calendar.MINUTE) + " " +
+                    instance.get(Calendar.HOUR_OF_DAY) + " " +
+                    instance.get(Calendar.DATE) + " * ?";
+        }
+
+        return null;
+    }
+
+    private String getDayOfWeek(Calendar instance) {
+        int index = instance.get(Calendar.DAY_OF_WEEK) - 1;
+        return week[index];
+    }
+
+
+
+    public void removeTask(ScheduleManager scheduleManager, GlobalTaskEntity taskEntity){
+        JobKey jobKey = new JobKey(taskEntity.getTaskId().toString());
+        TriggerKey triggerKey = new TriggerKey(taskEntity.getTaskId().toString());
+        scheduleManager.removeJob(jobKey, triggerKey);
+    }
+
+    public void executeTask(ScheduleManager scheduleManager, GlobalTaskEntity taskEntity) throws Exception{
+        JobKey jobKey = new JobKey(taskEntity.getTaskId().toString());
+        scheduleManager.fireNow(jobKey);
+    }
+
+
+
+    //判断任务是否过期
+    public Boolean taskExpire(Long endTime) {
+        if (ObjectUtils.isEmpty(endTime)) return false;
+        Long now = System.currentTimeMillis();
+        return now > endTime;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        String beanName = null;
+        String className = this.getClass().getName();
+        className = className.substring(className.lastIndexOf(".") + 1);
+        if(className.length() > 1) {
+            beanName = className.substring(0, 1).toLowerCase() + className.substring(1);
+        } else {
+            beanName = className.toLowerCase();
+        }
+        TaskStrategyFactory.register( beanName, this);
+    }
+
+}

backend/src/main/java/io/dataease/job/sechedule/strategy/TaskStrategyFactory.java

+package io.dataease.job.sechedule.strategy;
+
+import org.apache.commons.lang3.StringUtils;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class TaskStrategyFactory {
+
+
+
+    private static Map<String, TaskHandler> strategyMap = new ConcurrentHashMap<>();
+
+    public static TaskHandler getInvokeStrategy(String name) {
+        return strategyMap.get(name);
+    }
+
+    public static void register(String name, TaskHandler handler) {
+        if (StringUtils.isEmpty(name) || null == handler) {
+            return;
+        }
+        strategyMap.put(name, handler);
+    }
+}

backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java

+package io.dataease.job.sechedule.strategy.impl;
+
+
+import io.dataease.auth.entity.SysUserEntity;
+import io.dataease.auth.entity.TokenInfo;
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.auth.util.JWTUtils;
+import io.dataease.commons.utils.CodingUtil;
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.job.sechedule.strategy.TaskHandler;
+
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import io.dataease.plugins.common.entity.GlobalTaskInstance;
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.xpack.email.dto.response.XpackEmailTemplateDTO;
+import io.dataease.plugins.xpack.email.service.EmailXpackService;
+import org.quartz.*;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+
+@Service
+public class EmailTaskHandler extends TaskHandler implements Job {
+
+
+    private static final Integer RUNING = 0;
+
+
+    private AuthUserService authUserService;
+
+
+    @Override
+    protected JobDataMap jobDataMap(GlobalTaskEntity taskEntity) {
+        JobDataMap jobDataMap = new JobDataMap();
+        jobDataMap.put("taskEntity", taskEntity);
+        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+        XpackEmailTemplateDTO emailTemplateDTO = emailXpackService.emailTemplate(taskEntity.getTaskId());
+        jobDataMap.put("emailTemplate", emailTemplateDTO);
+
+        SysUserEntity creator = CommonBeanFactory.getBean(AuthUserService.class).getUserById(taskEntity.getCreator());
+        jobDataMap.put("creator", creator);
+        return jobDataMap;
+    }
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        // 插件没有加载 空转
+        if(!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) return;
+
+        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+        GlobalTaskEntity taskEntity = (GlobalTaskEntity)jobDataMap.get("taskEntity");
+
+        GlobalTaskInstance taskInstance = buildInstance(taskEntity);
+        Long instanceId = saveInstance(taskInstance);
+        taskInstance.setInstanceId(instanceId);
+
+
+        XpackEmailTemplateDTO emailTemplate = (XpackEmailTemplateDTO) jobDataMap.get("emailTemplate");
+
+
+        SysUserEntity creator = (SysUserEntity) jobDataMap.get("creator");
+
+        proxy().sendReport(taskEntity, taskInstance, emailTemplate, creator);
+
+    }
+
+
+    public EmailTaskHandler proxy() {
+        return CommonBeanFactory.getBean(EmailTaskHandler.class);
+    }
+
+    public Long saveInstance(GlobalTaskInstance taskInstance){
+        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+        return emailXpackService.saveInstance(taskInstance);
+    }
+
+    private GlobalTaskInstance buildInstance(GlobalTaskEntity taskEntity) {
+        GlobalTaskInstance taskInstance = new GlobalTaskInstance();
+        taskInstance.setTaskId(taskEntity.getTaskId());
+        taskInstance.setStatus(RUNING);
+        taskInstance.setExecuteTime(System.currentTimeMillis());
+        return taskInstance;
+    }
+
+
+
+    @Async
+    public void sendReport(GlobalTaskEntity taskEntity, GlobalTaskInstance taskInstance, XpackEmailTemplateDTO emailTemplateDTO, SysUserEntity user) {
+        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+        String fileId = emailXpackService.print(panelUrl(emailTemplateDTO.getPanelId()), tokenByUser(user));
+        // 下面继续执行发送邮件的略记
+        String recipients = emailTemplateDTO.getRecipients();
+        byte[] content = emailTemplateDTO.getContent();
+    }
+
+
+
+    private String tokenByUser(SysUserEntity user) {
+        TokenInfo tokenInfo = TokenInfo.builder().userId(user.getUserId()).username(user.getUsername()).build();
+        String token = JWTUtils.sign(tokenInfo, user.getPassword());
+        return token;
+    }
+
+    private String panelUrl(String panelId) {
+        InetAddress ip = null;
+        try {
+            ip = InetAddress.getLocalHost();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        Environment environment = SpringContextUtil.getBean(Environment.class);
+        Integer port = environment.getProperty("server.port", Integer.class);
+        String url = "http://" + ip + ":"+port + "/#/preview/" + panelId;
+
+        return url;
+    }
+
+}

backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java

+package io.dataease.listener;
+
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.job.sechedule.strategy.TaskHandler;
+import io.dataease.job.sechedule.strategy.TaskStrategyFactory;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.xpack.email.service.EmailXpackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class GlobalTaskStartListener implements ApplicationListener<ApplicationReadyEvent> {
+
+    @Autowired
+    private AuthUserService authUserService;
+
+    @Autowired
+    private ScheduleManager scheduleManager;
+
+    @Override
+    public void onApplicationEvent(ApplicationReadyEvent event) {
+        if (authUserService.pluginLoaded()) {
+            EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+
+            List<GlobalTaskEntity> tasks = emailXpackService.allTask();
+            tasks.stream().forEach(task -> {
+                TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(task.getTaskType());
+                try {
+                    taskHandler.addTask(scheduleManager, task);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
+        }
+    }
+}

backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java

+package io.dataease.plugins.server;
+
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.BeanUtils;
+import io.dataease.commons.utils.PageUtils;
+import io.dataease.commons.utils.Pager;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import io.dataease.plugins.common.entity.XpackGridRequest;
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.xpack.email.dto.request.XpackEmailCreate;
+import io.dataease.plugins.xpack.email.dto.request.XpackEmailTaskRequest;
+import io.dataease.plugins.xpack.email.dto.response.XpackTaskGridDTO;
+import io.dataease.plugins.xpack.email.service.EmailXpackService;
+import io.dataease.service.ScheduleService;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "xpack：定时报告")
+@RequestMapping("/plugin/task")
+@RestController
+public class XEmailTaskServer {
+
+    @Autowired
+    private ScheduleService scheduleService;
+
+    @PostMapping("/queryTasks/{goPage}/{pageSize}")
+    public Pager<List<XpackTaskGridDTO>> queryTask(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody XpackGridRequest request) {
+        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<XpackTaskGridDTO> tasks = emailXpackService.taskGrid(request);
+        Pager<List<XpackTaskGridDTO>> listPager = PageUtils.setPageInfo(page, tasks);
+        return listPager;
+    }
+
+    @PostMapping("/save")
+    public void save(@RequestBody XpackEmailCreate param) throws Exception{
+        XpackEmailTaskRequest request = param.fillContent();
+        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+        request.setCreator(AuthUtils.getUser().getUserId());
+        emailXpackService.save(request);
+        GlobalTaskEntity globalTask = BeanUtils.copyBean(new GlobalTaskEntity(), request);
+        scheduleService.addSchedule(globalTask);
+    }
+
+    @PostMapping("/queryForm/{taskId}")
+    public XpackEmailCreate queryForm(@PathVariable Long taskId) {
+        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
+
+        XpackEmailTaskRequest taskForm = emailXpackService.taskForm(taskId);
+        XpackEmailCreate xpackEmailCreate = new XpackEmailCreate();
+        byte[] bytes = taskForm.getContent();
+
+        if(ObjectUtils.isNotEmpty(bytes)) {
+            String emailContent;
+            try {
+                emailContent = new String(bytes, "UTF-8");
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            taskForm.setContent(null);
+            xpackEmailCreate.setEmailContent(emailContent);
+        }
+        xpackEmailCreate.setRequest(taskForm);
+        return xpackEmailCreate;
+    }
+}

backend/src/main/java/io/dataease/service/ScheduleService.java

@@ -4,6 +4,9 @@ import io.dataease.base.domain.DatasetTableTask;
 import io.dataease.commons.constants.ScheduleType;
 import io.dataease.job.sechedule.ExtractDataJob;
 import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.job.sechedule.strategy.TaskHandler;
+import io.dataease.job.sechedule.strategy.TaskStrategyFactory;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.JobKey;
 import org.quartz.TriggerKey;
@@ -59,4 +62,20 @@ public class ScheduleService {
     public void fireNow(DatasetTableTask datasetTableTask) throws Exception{
         scheduleManager.fireNow(datasetTableTask.getId(), datasetTableTask.getTableId());
     }
+
+    public void addSchedule(GlobalTaskEntity task) throws Exception{
+        TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(task.getTaskType());
+        taskHandler.addTask(scheduleManager, task);
+    }
+    public void deleteSchedule(GlobalTaskEntity task) {
+        TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(task.getTaskType());
+        taskHandler.removeTask(scheduleManager, task);
+    }
+
+    public void fireNow(GlobalTaskEntity task) throws Exception{
+        TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(task.getTaskType());
+        taskHandler.executeTask(scheduleManager, task);
+    }
+
+
 }

frontend/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>dataease-server</artifactId>
     <groupId>io.dataease</groupId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

frontend/src/styles/index.scss

@@ -684,6 +684,42 @@ div:focus {
   background: linear-gradient(to right, #fff, rgba(255,255,255,0)) !important;
 }
 
+
+.rate-date-class > .el-picker-panel__footer > .el-button--text:first-child{
+    display: none;
+  }
+  .rate-date-class > .el-picker-panel__body-wrapper > .el-picker-panel__body {
+      >.el-date-picker__header {
+          display: none;
+      }
+      >.el-picker-panel__content{
+          >table > tbody {
+            >tr:first-child {
+                display: none;
+            }
+            >tr >td.prev-month,td.next-month {
+                display: none;
+            }
+          } 
+      }
+  }
+  .rate-day-class > .el-picker-panel__footer > .el-button--text:first-child{
+    display: none;
+  }
+  .rate-day-class > .el-picker-panel__body-wrapper > .el-picker-panel__body {
+    >.el-date-picker__header {
+        display: none;
+    }
+    >.el-picker-panel__content{
+        >table > tbody {
+          >tr:not(:nth-child(3)) {
+              display: none;
+          }
+          
+        } 
+    }
+  }
+
 .chart-type .el-radio__input{
   display: none!important;
 }

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease-server</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <packaging>pom</packaging>
 
     <parent>