:white_check_mark: 导出图片增加限制

airport-vue/src/mixins/JeecgListMixin.js

@@ -20,7 +20,7 @@ export const JeecgListMixin = {
       ipagination:{
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['10', '20', '30', '50', '100', '200'],
+        pageSizeOptions: ['10', '20', '30', '50', '100', '150', '200', '300'],
         showTotal: (total, range) => {
           return range[0] + "-" + range[1] + " 共" + total + "条"
         },
@@ -53,6 +53,7 @@ export const JeecgListMixin = {
   },
   created() {
       if(!this.disableMixinCreated){
+        this.pageInit();
         console.log(' -- mixin created -- ')
         this.loadData();
         //初始化字典配置 在自己页面定义
@@ -71,6 +72,13 @@ export const JeecgListMixin = {
     }
   },
   methods:{
+    pageInit() {
+    //  页面初始化操作
+    },
+    exportXlsBefore(){
+    //  导出内容前置操作，返回boolean
+      return true;
+    },
     loadData(arg) {
       if(!this.url.list){
         this.$message.error("请设置url.list属性!")
@@ -311,6 +319,9 @@ export const JeecgListMixin = {
       window.location.href = url;
     },
     handleExportXls(fileName){
+      if (!this.exportXlsBefore()) {
+        return;
+      }
       if(!fileName || typeof fileName != "string"){
         fileName = "导出文件"
       }
@@ -318,11 +329,30 @@ export const JeecgListMixin = {
       if(this.selectedRowKeys && this.selectedRowKeys.length>0){
         param['selections'] = this.selectedRowKeys.join(",")
       }
+      let that = this;
       console.log("导出参数",param)
+      this.exportXlsLoading = true;
+      this.$message.info("导出中请耐心等待")
       downFile(this.url.exportXlsUrl,param).then((data)=>{
         if (!data) {
           this.$message.warning("文件下载失败")
           return
+        } else {
+          if (data['type'] === 'application/json') {
+            that.blobToJson(data).then(json =>{
+              console.log(json);
+              if (json['result']) {
+                if (json['result']['code'] === 200) {
+                  that.$message.info(json['result']['message'])
+                } else {
+                  that.$message.error(json['result']['message'])
+                }
+              }
+            })
+            return;
+          }
+
+          this.$message.success("导出成功！请等待文件下载！")
         }
         if (typeof window.navigator.msSaveBlob !== 'undefined') {
           window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
@@ -337,6 +367,10 @@ export const JeecgListMixin = {
           document.body.removeChild(link); //下载完成移除元素
           window.URL.revokeObjectURL(url); //释放掉blob对象
         }
+      }).catch(err => {
+        this.$message.error("文件较大或导出时发生错误")
+      }).finally((fin)=> {
+        this.exportXlsLoading = false;
       })
     },
     /* 导入 */
@@ -411,6 +445,20 @@ export const JeecgListMixin = {
       let url = getFileAccessHttpUrl(text)
       window.open(url);
     },
+    blobToJson(blob) {
+      return new Promise((resolve, reject) =>{
+        const reader = new FileReader();
+        reader.readAsText(blob, 'utf-8');
+        reader.onload = () =>{
+          try {
+            const json = JSON.parse(reader.result);
+            resolve(json);
+          } catch (e) {
+            reject(e);
+          }
+        };
+      });
+    },
   }
 
 }

airport-vue/src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   //baseURL: '/jeecg-boot',
   baseURL: apiBaseUrl, // api base_url
   // timeout: 9000 // 请求超时时间
-  timeout: 15000 // 请求超时时间
+  timeout: 240000 // 请求超时时间
 })
 
 const err = (error) => {

airport-vue/src/views/admin/AdminAirbridgeTestList.vue

@@ -23,7 +23,9 @@
             <a-form-item label="测试时间">
               <a-range-picker
                 format="YYYY-MM-DD"
+                :allowClear="true"
                 :placeholder="['开始时间', '结束时间']"
+                v-model="rangePickerValue"
                 @change="onCreateDateRangeChange"
                 @ok="onCreateDateRangeOk"
               ></a-range-picker>
@@ -47,7 +49,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('廊桥测试')">导出</a-button>
+      <a-button type="primary" icon="download" :loading="exportXlsLoading" @click="handleExportXls('廊桥测试')">导出</a-button>
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
@@ -137,6 +139,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AdminAirbridgeTestModal from './modules/AdminAirbridgeTestModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import moment, { Moment } from 'moment';
 
   export default {
     name: 'AdminAirbridgeTestList',
@@ -147,6 +150,8 @@
     data () {
       return {
         description: '廊桥测试管理页面',
+        exportXlsLoading: false,
+        rangePickerValue: [moment(),moment()],
         // 表头
         columns: [
           {
@@ -241,6 +246,20 @@
       },
     },
     methods: {
+      pageInit(){
+        let dateStr = moment().format('YYYY-MM-DD')
+        this.queryParam.sCDateTime = dateStr;
+        this.queryParam.eCDateTime = dateStr;
+      },
+      exportXlsBefore(){
+/*        let days = moment(this.queryParam.eCDateTime).diff(moment(this.queryParam.sCDateTime), 'days');
+        if (days > 0) {
+          this.$message.warning("数据量过大仅能导出一天数据")
+          return false;
+        } else {*/
+          return true;
+        // }
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

airport-vue/src/views/admin/AdminPostRecordList.vue

@@ -22,7 +22,9 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="到岗时间">
               <a-range-picker
+                :allowClear="true"
                 format="YYYY-MM-DD"
+                v-model="rangePickerValue"
                 :placeholder="['开始时间', '结束时间']"
                 @change="onCreateDateRangeChange"
                 @ok="onCreateDateRangeOk"
@@ -47,7 +49,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('岗位记录')">导出</a-button>
+      <a-button type="primary" icon="download" :loading="exportXlsLoading" @click="handleExportXls('岗位记录')">导出</a-button>
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
@@ -137,6 +139,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AdminPostRecordModal from './modules/AdminPostRecordModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import moment, { Moment } from 'moment';
 
   export default {
     name: 'AdminPostRecordList',
@@ -147,6 +150,8 @@
     data () {
       return {
         description: '岗位记录管理页面',
+        exportXlsLoading: false,
+        rangePickerValue:[moment(),moment()],
         // 表头
         columns: [
           {
@@ -249,6 +254,20 @@
       },
     },
     methods: {
+      pageInit(){
+        let dateStr = moment().format('YYYY-MM-DD')
+        this.queryParam.sCDateTime = dateStr;
+        this.queryParam.eCDateTime = dateStr;
+      },
+      exportXlsBefore(){
+/*        let days = moment(this.queryParam.eCDateTime).diff(moment(this.queryParam.sCDateTime), 'days');
+        if (days > 0) {
+          this.$message.warning("数据量过大仅能导出一天数据")
+          return false;
+        } else {*/
+          return true;
+        // }
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_airbridge_test/controller/AdminAirbridgeTestController.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.utils.AirportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -41,8 +42,9 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
- /**
+/**
  * @Description: 廊桥测试
  * @Author: jeecg-boot
  * @Date:   2023-04-27
@@ -205,6 +207,12 @@ public class AdminAirbridgeTestController extends JeecgController<AdminAirbridge
 		} else {
 			exportList = pageList;
 		}
+		String exportNum = AirportUtil.getProperty("airport.system.exportNum");
+		if(exportList!=null && exportList.size() > Integer.parseInt(exportNum)) {
+			ModelAndView modelAndView=new ModelAndView(new MappingJackson2JsonView());
+			modelAndView.addObject(Result.error("数据量过多超出" + exportNum + "条数据限制，请手动选择下载"));
+			return modelAndView;
+		}
 
 		// Step.3 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_order/controller/AdminOrderController.java

@@ -196,7 +196,15 @@ public class AdminOrderController {
             HtmlToPdf.convert( outputFolderHtml, outputFolder );
 
 //            AddWatermarkToPDF.convert(fileName,"temp\\sy.png");
-            long after24HoursInMillis = byId.getQifeiTime().getTime() + 24 * 60 * 60 * 1000; // 将毫秒数增加 24 小时
+            Date qifeiTime = byId.getQifeiTime();
+            if (qifeiTime == null) {
+                if ("交接结束".equals(byId.getType())){
+                    qifeiTime = byId.getUpdateTime();
+                } else {
+                    qifeiTime = byId.getUpdateTime();
+                }
+            }
+            long after24HoursInMillis = qifeiTime.getTime() + 24 * 60 * 60 * 1000; // 将毫秒数增加 24 小时
             Date after24Hours = new Date(after24HoursInMillis);
             if (after24Hours.before(new Date(  ))) {
                //打印加水印

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record/controller/AdminPostRecordController.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.utils.AirportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -41,8 +42,9 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
- /**
+/**
  * @Description: 岗位记录
  * @Author: jeecg-boot
  * @Date:   2023-04-27
@@ -206,6 +208,12 @@ public class AdminPostRecordController extends JeecgController<AdminPostRecord,
 		 } else {
 			 exportList = pageList;
 		 }
+		 String exportNum = AirportUtil.getProperty("airport.system.exportNum");
+		 if(exportList!=null && exportList.size() > Integer.parseInt(exportNum)) {
+			 ModelAndView modelAndView=new ModelAndView(new MappingJackson2JsonView());
+			 modelAndView.addObject(Result.error("数据量过多超出" + exportNum + "条数据限制，请手动选择下载"));
+			 return modelAndView;
+		 }
 
 		 // Step.3 AutoPoi 导出Excel
 		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aop/ControllerAspect.java

@@ -17,6 +17,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.utils.AirportUtil;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.Aware;
 import org.springframework.core.io.InputStreamSource;
 import org.springframework.messaging.handler.annotation.support.MethodArgumentNotValidException;
 import org.springframework.stereotype.Component;
@@ -25,6 +26,8 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.View;
 
 import javax.security.auth.message.AuthException;
 import javax.servlet.ServletRequest;
@@ -90,7 +93,7 @@ public class ControllerAspect {
             if (args != null) {
                 Object[] objects = new Object[args.length];
                 for (int i = 0; i < objects.length; i++) {
-                    if (args[i] instanceof ServletRequest || args[i] instanceof ServletResponse || args[i] instanceof InputStreamSource || args[i] instanceof BindingResult|| args[i] instanceof MultipartFile) {
+                    if (args[i] instanceof Aware ||args[i] instanceof View || args[i] instanceof ModelAndView ||args[i] instanceof ServletRequest || args[i] instanceof ServletResponse || args[i] instanceof InputStreamSource || args[i] instanceof BindingResult|| args[i] instanceof MultipartFile) {
                         // 不打印request
                         continue;
                     }
@@ -101,7 +104,11 @@ public class ControllerAspect {
             startTime = System.currentTimeMillis();
             Object response = pjp.proceed();
             // 3.出参打印
-            log.info("返回参数 : {}", response != null ? objectMapper.writeValueAsString(response) : "null");
+            if (!(response instanceof Aware ||response instanceof View ||response instanceof ModelAndView ||response instanceof ServletRequest || response instanceof ServletResponse || response instanceof InputStreamSource || response instanceof BindingResult|| response instanceof MultipartFile)) {
+                log.info("返回参数 : {}", response != null ? objectMapper.writeValueAsString(response) : "null");
+            } else {
+                log.info("返回参数 : {}", "无法格式化数据");
+            }
             return response;
         } catch (Throwable e) {
             if (e instanceof MethodArgumentNotValidException) {

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/AirportUtil.java

@@ -70,6 +70,10 @@ public class AirportUtil implements ApplicationContextAware {
         return getLocalUploadPath() + getEnvironment().getProperty("jeecg.path.temp");
     }
 
+    public static String getLocalUploadPicPath() {
+        return getLocalUploadPath() + getEnvironment().getProperty("jeecg.path.upload") + "/temp";
+    }
+
     public static ObjectMapper getObjectMapper() {
         return objectMapper;
     }

airport/jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -24,7 +24,8 @@ airport:
   mq:
     msgHandlerEvent: false
   system:
-    host: http://127.0.0.1:9999/airport
+    host: http://192.168.2.88:9999/airport
+    exportNum: 300
 
 spring:
 #  thymeleaf:
@@ -100,9 +101,9 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #定时任务启动开关，true-开  false-关
-    auto-startup: true
+    auto-startup: false
     #启动时更新己存在的Job
-    overwrite-existing-jobs: true
+    overwrite-existing-jobs: false
     properties:
       org:
         quartz:
@@ -260,7 +261,7 @@ jeecg:
   path:
     #文件上传根目录 设置
     upload: D:\\AJeecgBootFiles
-    temp: \\tempFile
+    temp: /tempFile
     #webapp文件路径
     webapp: D:\\AJeecgBootFiles
   shiro:

airport/jeecg-boot-module-system/src/main/resources/application-local.yml

@@ -25,7 +25,7 @@ airport:
     msgHandlerEvent: false
   system:
     host: http://127.0.0.1:9999/airport
-
+    exportNum: 300
 spring:
 #  thymeleaf:
 #    cache: false

airport/jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -32,6 +32,7 @@ airport:
     msgHandlerEvent: true
   system:
     host: https://wnzjszs.wzair.cn/airport
+    exportNum: 300
 
 spring:
 #  thymeleaf: