浦东公交调度系统-人员停用提示（功能）修正

1、修改home.html，限制显示8条信息，添加下载所有信息文件按钮功能 2、添加MyStringUtils.java，判定字符串是否中文 3、修正vehicleDataSyncController.java，修改下载文件中文名字的问题

浦东公交调度系统-人员停用提示（功能）修正
1、修改home.html，限制显示8条信息，添加下载所有信息文件按钮功能 2、添加MyStringUtils.java，判定字符串是否中文 3、修正vehicleDataSyncController.java，修改下载文件中文名字的问题
徐烜
1 parent 2dcf6ac7
Showing 6 changed files with 80 additions and 9 deletions
src/main/java/com/bsth/controller/schedule/core/legacy/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/datasync/VehicleDataSyncController.java
src/main/java/com/bsth/service/schedule/utils/MyStringUtils.java
src/main/resources/static/pages/home.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/vehicleDataSyncManage/service.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
@@ -14,7 +14,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,7 +75,29 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         }
         return rtn;
+    }
+    @GetMapping(value = "/validate_get_destroy_info/download")
+    public void exportValidateGetDestroyInfo(
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+        // 流输出导出文件
+        response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("人员配置停用信息.txt", "UTF-8"));
+        response.setContentType("application/octet-stream");
+
+        try (
+                OutputStream os = response.getOutputStream();
+                PrintWriter printWriter = new PrintWriter(os);
+        ) {
+            HttpSession session = request.getSession();
+            List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+            List<String> infos = this.employeeConfigInfoService.validate_get_destroy_info(cmyAuths);
+            for (String info : infos) {
+                printWriter.println(info);
+            }
+            printWriter.flush();
+        }
     }
     @RequestMapping(value = "/validate_jsy_destroy", method = RequestMethod.GET)
@@ -6,11 +6,13 @@ import com.bsth.controller.schedule.datasync.request.VehicleDataSyncTaskRequest;
 import com.bsth.entity.schedule.datasync.VehicleDataSyncTask;
 import com.bsth.entity.schedule.datasync.VehicleDataSyncTaskTypeEnum;
 import com.bsth.service.schedule.datasync.VehicleDataSyncTaskService;
+import com.bsth.service.schedule.utils.MyStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.URLEncoder;
 import java.util.Date;
 @RestController
@@ -116,7 +118,12 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask, 
     private void responseStreamFile(HttpServletResponse response, File file) throws IOException {
         // 流输出导出文件
         response.setHeader("content-type", "application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
+        String fileName = file.getName();
+        if (MyStringUtils.isContainChinese(fileName)) {
+            response.setHeader("Content-Disposition", "attachment; filename*=" + URLEncoder.encode(fileName, "UTF-8"));
+        } else {
+            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        }
         response.setContentType("application/octet-stream");
         try (
+package com.bsth.service.schedule.utils;
+
+import org.springframework.util.Assert;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 字符串工具类。
+ */
+public class MyStringUtils {
+    /**
+     * 字符串是否包含中文
+     *
+     * @param str 待校验字符串
+     * @return true 包含中文字符 false 不包含中文字符
+     */
+    public static boolean isContainChinese(String str) {
+        Assert.hasText(str, "字符串为空！");
+
+        Pattern p = Pattern.compile("[\u4E00-\u9FA5|\\！|\\，|\\。|\\（|\\）|\\《|\\》|\\“|\\”|\\？|\\：|\\；|\\【|\\】]");
+        Matcher m = p.matcher(str);
+        if (m.find()) {
+            return true;
+        }
+        return false;
+    }
+}
@@ -83,15 +83,25 @@
         success: function(rs) {
             if (rs && rs.status === "SUCCESS") {
                 if (rs.data && rs.data.length && rs.data.length > 0) {
+                    var text = "";
+                    if (rs.data.length > 8) {
+                        text = "部分停用信息如下：</br>" + rs.data.slice(0, 8).join("</br>");
+                    } else {
+                        text = "所有停用信息如下：</br>" + rs.data.join("</br>");
+                    }
                     swal({
                         title: "人员配置停用信息",
-                        text: rs.data.join("</br>"),
+                        text: text,
                         html: true,
                         type: "warning",
                         showCancelButton: true,
-                        confirmButtonColor: "RED",
-                        confirmButtonText: "是",
-                        cancelButtonText: "取消"
+                        cancelButtonText: "关闭",
+                        confirmButtonColor: "#3598dc",
+                        confirmButtonText: "下载所有停用信息",
+                        closeOnConfirm: false
+
+                    }, function() {
+                        window.location.href = "/eci/validate_get_destroy_info/download";
                     });
                 }
             }
@@ -49,11 +49,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                 }
                                 // console.log(headers("Content-Disposition"));
-                                // 获取文件名
+                                // 获取文件名，后台根据是否还有中文名字，返回filename=ascii编码的文件名 或 filename*=unicode编码的文件名
                                 var fileName = headers("Content-Disposition").split(";")[1].split("filename=")[1];
                                 var fileNameUnicode = headers("Content-Disposition").split("filename*=")[1];
                                 if (fileNameUnicode) {//当存在 filename* 时，取filename* 并进行解码（为了解决中文乱码问题）
-                                    fileName = decodeURIComponent(fileNameUnicode.split("''")[1]);
+                                    fileName = decodeURIComponent(fileNameUnicode);
                                 }
                                 return {fileData : data, fileName: fileName};
@@ -235,11 +235,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                 }
                                 // console.log(headers("Content-Disposition"));
-                                // 获取文件名
+                                // 获取文件名，后台根据是否还有中文名字，返回filename=ascii编码的文件名 或 filename*=unicode编码的文件名
                                 var fileName = headers("Content-Disposition").split(";")[1].split("filename=")[1];
                                 var fileNameUnicode = headers("Content-Disposition").split("filename*=")[1];
                                 if (fileNameUnicode) {//当存在 filename* 时，取filename* 并进行解码（为了解决中文乱码问题）
-                                    fileName = decodeURIComponent(fileNameUnicode.split("''")[1]);
+                                    fileName = decodeURIComponent(fileNameUnicode);
                                 }
                                 return {fileData : data, fileName: fileName};