Jelajahi Sumber

fix on 2020.8.19

jiequan.bi 4 tahun lalu
induk
melakukan
59e1e8a6bf

+ 0 - 6
jeecg-boot-module-system/pom.xml

@@ -139,12 +139,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.bstek.ureport</groupId>
-            <artifactId>ureport2-console</artifactId>
-            <version>2.2.9</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
             <version>3.17</version>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -168,7 +168,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ureport/**", "anon");
         filterChainDefinitionMap.put("/job/test/*", "anon");
         filterChainDefinitionMap.put("/third/*", "anon");
-        //filterChainDefinitionMap.put("/kuaishou/**", "anon");
+        filterChainDefinitionMap.put("/ctop/kuaishou/dailyPage/**", "anon");
         filterChainDefinitionMap.put("/rest/script/*", "anon");
         filterChainDefinitionMap.put("/ctop/checkTaskList/*", "anon");
 

+ 26 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UReportFileBindUserController.java

@@ -15,6 +15,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.UReportFile;
 import org.jeecg.modules.ctop.entity.UReportFileBindUser;
 import org.jeecg.modules.ctop.service.IUReportFileBindUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -207,4 +209,28 @@ public class UReportFileBindUserController {
         }
         return result;
     }
+
+
+    /**
+     *  订阅按钮
+     */
+    @PostMapping(value = "/subscribe")
+    public Result subscribe(@RequestParam(name = "id") String fileId) {
+        Result<UReportFile> result = new Result<>();
+        QueryWrapper<UReportFileBindUser> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("file_id",fileId);
+        queryWrapper.ne("user_id","e9ca23d68d884d4ebb19d07889727dae");
+        List<UReportFileBindUser> uReportFileBindUser = uReportFileBindUserService.list(queryWrapper);
+        if (uReportFileBindUser.isEmpty()) {
+            result.error500("请绑定用户后订阅");
+        } else {
+            uReportFileBindUser.forEach(it->it.setIsSubscribe(true));
+            boolean ok = uReportFileBindUserService.updateBatchById(uReportFileBindUser);
+            if (ok) {
+                result.success("订阅成功!");
+            }
+        }
+        return result;
+    }
+
 }

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UReportFileController.java

@@ -193,4 +193,5 @@ public class UReportFileController {
         }
         return result;
     }
+
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.java

@@ -1,6 +1,10 @@
 package org.jeecg.modules.message.handle;
 
+import java.io.File;
+
 public interface ISendMsgHandle {
 
 	void SendMsg(String es_receiver, String es_title, String es_content);
+
+	void SendAttachment(String es_receiver, String es_title, String es_content, File attachment);
 }

+ 21 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java

@@ -2,15 +2,16 @@ package org.jeecg.modules.message.handle.impl;
 
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.message.handle.ISendMsgHandle;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
+import java.io.File;
 
 public class EmailSendMsgHandle implements ISendMsgHandle {
-    static String emailFrom;
+
+    private static String emailFrom;
 
     public static void setEmailFrom(String emailFrom) {
         EmailSendMsgHandle.emailFrom = emailFrom;
@@ -32,6 +33,24 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
         } catch (MessagingException e) {
             e.printStackTrace();
         }
+    }
 
+    @Override
+    public void SendAttachment(String es_receiver, String es_title, String es_content, File attachment) {
+        JavaMailSender mailSender = (JavaMailSender) SpringContextUtils.getBean("mailSender");
+        MimeMessage message = mailSender.createMimeMessage();
+        MimeMessageHelper helper = null;
+        try {
+            helper = new MimeMessageHelper(message, true);
+            // 设置发送方邮箱地址
+            helper.setFrom(emailFrom);
+            helper.setTo(es_receiver);
+            helper.setSubject(es_title);
+            helper.setText(es_content, true);
+            helper.addAttachment(attachment.getName(),attachment);
+            mailSender.send(message);
+        } catch (MessagingException e) {
+            e.printStackTrace();
+        }
     }
 }

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.message.handle.impl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.message.handle.ISendMsgHandle;
 
+import java.io.File;
+
 @Slf4j
 public class SmsSendMsgHandle implements ISendMsgHandle {
 
@@ -12,4 +14,9 @@ public class SmsSendMsgHandle implements ISendMsgHandle {
 		log.info("发短信");
 	}
 
+	@Override
+	public void SendAttachment(String es_receiver, String es_title, String es_content, File attachment) {
+
+	}
+
 }

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.message.handle.impl;
 
 import org.jeecg.modules.message.handle.ISendMsgHandle;
 
+import java.io.File;
+
 /**
  * @author jeecg-boot
  * 2019年12月5日19:55:14
@@ -13,4 +15,9 @@ public class WxSendMsgHandle implements ISendMsgHandle {
 	public void SendMsg(String es_receiver, String es_title, String es_content) {
 
 	}
+
+	@Override
+	public void SendAttachment(String es_receiver, String es_title, String es_content, File attachment) {
+
+	}
 }

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -93,7 +93,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://39.106.184.70/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver

+ 6 - 1
module-check/src/main/java/cn/com/ctop/check/script/TestGroovyScript.java

@@ -5,6 +5,7 @@ import cn.com.ctop.check.service.ICtopCheckTaskListService;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.ICustomDataByAccountService;
+import cn.com.ctop.common.module.service.IUReportExportService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.service.impl.CustomDataByAccountImpl;
 import cn.com.ctop.common.module.service.impl.UserAllocationServiceImpl;
@@ -44,11 +45,15 @@ public class TestGroovyScript {
     @Autowired
     ICustomDataByAccountService customDataByAccountService;
 
+    @Autowired
+    IUReportExportService iuReportExportService;
+
     @GetMapping("/test")
     public Result testGroovy(){
         //groovyScriptExecutor.execute(2,"CheckAccountStatusScript");
         //groovyScriptExecutor.execute(13,"CheckKsDataDiffScript");
-        groovyScriptExecutor.execute(14,"CheckByDataDiffScript");
+        //groovyScriptExecutor.execute(14,"CheckByDataDiffScript");
+        iuReportExportService.exportExcel("file:2048球球大作战-日报.ureport.xml ");
         return Result.ok();
     }
 }

+ 2 - 0
module-check/src/main/java/cn/com/ctop/notice/handler/SendWeChatHandle.java

@@ -52,6 +52,8 @@ public class SendWeChatHandle {
                     messageList.add(message.substring((i+1)*1006));
                 }
             }
+        }else {
+            messageList.add(message);
         }
         return messageList;
     }

+ 6 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IUReportExportService.java

@@ -0,0 +1,6 @@
+package cn.com.ctop.common.module.service;
+
+public interface IUReportExportService {
+
+    void exportExcel(String fileName);
+}

+ 55 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/UReportExportServiceImpl.java

@@ -0,0 +1,55 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.service.IUReportExportService;
+import com.bstek.ureport.export.ExportConfigureImpl;
+import com.bstek.ureport.export.ExportManager;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.SpringContextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class UReportExportServiceImpl implements IUReportExportService {
+
+    @Autowired
+    RestTemplate restTemplate;
+    private static final String  outputDir=System.getProperty("user.dir")+File.separator + "uReport";
+
+    @Override
+    public void exportExcel(String fileName) {
+
+        String now= DateUtils.date2Str();
+        Map<String, Object> parameters=new HashMap<>();
+        parameters.put("start_date",now);
+        parameters.put("end_date",now);
+        parameters.put("stat_date,",now);
+        File file=new File(outputDir+File.separator);
+        OutputStream outputStream=null;
+        try {
+            outputStream=new FileOutputStream(file,true);
+            ExportConfigureImpl exportConfigure=new ExportConfigureImpl(fileName,parameters,outputStream);
+            getExportManager().exportExcel(exportConfigure);
+        } catch (FileNotFoundException e) {
+            log.error("定制化报表下载错误>>>UReportExportServiceImpl");
+        }finally {
+            if(outputStream!=null){
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+    private static ExportManager getExportManager(){
+        return (ExportManager)SpringContextUtils.getBean(ExportManager.BEAN_ID);
+    }
+}
+

+ 6 - 0
pom.xml

@@ -170,6 +170,12 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.bstek.ureport</groupId>
+            <artifactId>ureport2-console</artifactId>
+            <version>2.2.9</version>
+        </dependency>
+
         <!-- mybatis-plus -->
         <dependency>
             <groupId>com.baomidou</groupId>