no message

package.json

@@ -4,11 +4,10 @@
   "description": "",
   "main": "main.ts",
   "dependencies": {
-    "@alicloud/sms-sdk": "^1.1.6",
     "@types/node": "^10.12.18",
     "compression": "^1.7.4",
     "express": "^4.18.2",
-    "express-async-handler": "^1.1.4",
+    "express-async-handler": "1.1.4",
     "express-history-api-fallback": "^2.2.1",
     "formidable": "^1.2.1",
     "lru-cache": "^4.1.5",
@@ -21,6 +20,7 @@
     "pyfl": "^1.1.4",
     "request": "^2.88.0",
     "svg-captcha": "^1.3.12",
+    "xlsx": "^0.18.5",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {},

src/biz/cjw.ts

 import { cjwPopTableData, cjwTableData } from "../data/table/jcsjData";
-import { cjwExcelData, popExcelData } from "../main";
 
 // 村居委
 export function getData(req, res) {
-    // let popExcelData = cjwPopTableData();
-    // let cjwExcelData = cjwTableData();
+    let popExcelData = cjwPopTableData();
+    let cjwExcelData = cjwTableData();
     let name = req.query.name;
     
     let ret:any = {};

src/biz/jcsj.ts

@@ -3,13 +3,12 @@ import { gqTableData, jcsjTableData } from '../data/table/jcsjData';
 import { keyValuePackage, onceYBarChartPackage, tablePackage, stringListPackage } from '../dataPackage/inFrontOut';
 import { getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out';
 import { separateDataAndUint } from '../dataPackage/tool';
-import { excelData, jcsjExcelData } from '../main';
 
 /*基础数据*/
 
 export function getData(req, res) {
-    // let jcsjExcelData = jcsjTableData();
-    // let excelData = gqTableData();
+    let jcsjExcelData = jcsjTableData();
+    let excelData = gqTableData();
     let ret:any = {};
 
     let zssjPackageData = keyValuePackage(excelData['左上数据'].dataList);

src/biz/map.ts

 import { cjwPopTableData, mapTableData } from "../data/table/jcsjData";
 import { keyValuePackage, tablePackage } from "../dataPackage/inFrontOut";
 import { getKeyValueOut } from "../dataPackage/out";
-import { mapExcelData, cjwPopExcelData } from "../main";
 
 // 地图
 export function getData(req, res) {
-    // let mapExcelData = mapTableData();
-    // let cjwPopExcelData = cjwPopTableData();
+    let mapExcelData = mapTableData();
+    let cjwPopExcelData = cjwPopTableData();
 
     let ret:any = {};
 

src/biz/zdqy.ts

 import { zdhzqyPopTableData, zdhzqyTableData } from "../data/table/jcsjData";
 import { tablePackage } from "../dataPackage/inFrontOut";
 import { getTableOut } from "../dataPackage/out";
-import { zdqyExcelData, zdqyPopExcelData } from "../main";
 
 // 重点企业
 export function getData(req, res) {
-    // let zdqyPopExcelData = zdhzqyPopTableData();
-    // let zdqyExcelData = zdhzqyTableData();
+    let zdqyPopExcelData = zdhzqyPopTableData();
+    let zdqyExcelData = zdhzqyTableData();
 
     let name = req.query.name;
 

src/main.ts

@@ -5,14 +5,14 @@ import { initConfig, port } from "./config/serverConfig";
 import { initUserConfig } from "./config/users";
 import { cjwPopTableData, cjwTableData, gqTableData, jcsjTableData, mapTableData, zdhzqyPopTableData, zdhzqyTableData } from "./data/table/jcsjData";
 
-export let zdqyPopExcelData = zdhzqyPopTableData();
-export let zdqyExcelData = zdhzqyTableData();
-export let mapExcelData = mapTableData();
-export let cjwPopExcelData = cjwPopTableData();
-export let jcsjExcelData = jcsjTableData();
-export let excelData = gqTableData();
-export let popExcelData = cjwPopTableData();
-export let cjwExcelData = cjwTableData();
+// export let zdqyPopExcelData = zdhzqyPopTableData();
+// export let zdqyExcelData = zdhzqyTableData();
+// export let mapExcelData = mapTableData();
+// export let cjwPopExcelData = cjwPopTableData();
+// export let jcsjExcelData = jcsjTableData();
+// export let excelData = gqTableData();
+// export let popExcelData = cjwPopTableData();
+// export let cjwExcelData = cjwTableData();
 
 async function lanuch() {
     initUserConfig();

src/middleware/checkToken.ts

-
-export async function checkToken(req, res, next) { 
-    next();
-}
\ No newline at end of file

src/middleware/encryptionReturn.ts

-export async function encryptionReturn(req, res, next) {
-    res.on('end', function(){
-        console.log(res.body);
-    });
-
-    let resSend = res.send;
-    res.send = (obj)=>{
-        changeNumber(obj);
-        //递归修改number型
-        resSend.call(res, obj);
-    };
-    
-    next();
-}
-
-function changeNumber(obj) {
-    if (Array.isArray(obj)) {
-        for (let i = 0; i < obj.length; i++) {
-            let arrItem = obj[i];
-            if (typeof arrItem == "number") {
-                obj[i] = getSameLenNumber(arrItem);
-            }
-            else if (typeof arrItem == "object") {
-                changeNumber(arrItem);
-            }
-        }
-    }
-    else {
-        for (let key in obj) {
-            let objItem = obj[key];
-            if (typeof objItem == "number") {
-                if (key == "x" || key == "y") continue;
-                
-                obj[key] = getSameLenNumber(objItem);
-            }
-            else if (typeof objItem == "object") {
-                changeNumber(objItem);
-            }
-        }
-    }
-}
-
-function getSameLenNumber(num) {
-    let numStr = String(num);
-    //疑似年份的不做加密
-    if (numStr.length == 4 && (numStr.indexOf("19") == 0 || numStr.indexOf("20") == 0)) return num;
-    let str = "";
-    for (let i = 0; i < numStr.length; i++) {
-        if (numStr[i] == '.') str += numStr[i];
-        else str += "6";
-    }
-
-    return Number(str);
-}
\ No newline at end of file

src/net/http_server.ts

 import express = require('express');
 import bodyParser = require('body-parser');
-import sign = require('../middleware/sign');
 import routers = require('../routers/router');
 import compression = require('compression');
 import * as fallback from 'express-history-api-fallback';

src/util/analysisExcel.ts

 const xlsx = require('node-xlsx');
 const path = require('path');
+const XLSX = require('xlsx');
 
 /**
  *   onceSheetBecomeOfblockData 将excel文件的指定sheet解析成数据块数据
@@ -80,7 +81,7 @@ function getListFirstNullItemIndex(startX, list) { //获取第一个为空的坐
 }
 function listRegionIsNull(list, startX, endX) { //指定区间内数据是否未空
     let isNull = true;
-    if ( !list.length ) return isNull;
+    if ( !list || !list.length ) return isNull;
 
     for (let i = startX; i < endX; i++) {
         let item = list[i];
@@ -193,7 +194,22 @@ function checkBlock(dataList) {
 
 //获取单个excel文件的数据
 function getExcel(filePath) {
-    const workSheetsFromFile = xlsx.parse(filePath);
+    console.log();
+    
+    var tableData = XLSX.readFile(filePath);
+    
+    // let ms = new Date().valueOf();
+    // for (let key in workSheetsFromFile.Sheets["村居委表格数据"]) {
+    //     if (key == "!merges") console.log(key);
+    // }
+    // console.log(new Date().valueOf() - ms);
+    // const workSheetsFromFile2 = xlsx.parse(filePath);
+
+    let workSheetsFromFile = [];
+    for (let sheetName in tableData.Sheets) {
+        workSheetsFromFile.push({name:sheetName, data:sheetToArray(tableData.Sheets[sheetName])});
+    }
+    
     let sheetMap = {};
     let sheetList = [];
 
@@ -204,4 +220,29 @@ function getExcel(filePath) {
     }
 
     return {sheetMap, sheetList}  
+}
+
+//转换
+// sheetInfo = {"A10":value, "B12":value...}
+function sheetToArray(sheetInfo) {
+    let data = [];
+    for (let key in sheetInfo) {
+        let {v} = sheetInfo[key];
+        //key = A10
+        let 数字 = parseInt(key.replace(/[a-zA-Z]+/,""));
+        if (!数字) continue;
+        let 字母 = key.replace(/[0-9]+/,"");
+        let 字母长度 = 字母.length;
+        let 值 = -1;
+        for(let i = 0; i < 字母.length; i++) {
+            let 位数 = 字母长度-i;
+            let 数 = 字母[i].charCodeAt(0) - 64;
+            值 += Math.pow(26, 位数-1) * 数;
+        }
+        let 下标 = 数字 -1;
+        if (!data[下标]) data[下标] = [];
+        data[下标][值] = v || "";
+    }
+
+    return data;
 }
\ No newline at end of file