no message

serverConfig.xml

 <config>
-    <port>9096</port>
+    <port>9097</port>
 </config>
\ No newline at end of file

src/biz/cjw.ts

+import { get村居委弹窗 } from "../data/table/jcsjData";
+import { keyValuePackage, tablePackage } from "../dataPackage/inFrontOut";
+import { getKeyValueOut, getStringOut, getTableOut } from "../dataPackage/out";
+
+export function getData(req, res) {
+    let name = req.query.name;
+    let excelData = get村居委弹窗(name);
+
+    let ret:any = {};
+    
+    let fcsjPackageData = keyValuePackage(excelData['浮窗数据'].dataList);
+    ret['fcsj'] = getKeyValueOut('浮窗数据', fcsjPackageData);
+
+    let jbxxDataList = keyValuePackage(excelData['基本信息'].dataList);
+    let imgPackageData = [];
+    let jbxxPackageData = [];
+    jbxxDataList.forEach (info => {
+        let {key, value, unit} = info;
+        if (key == "图片") imgPackageData.push(info);
+        else jbxxPackageData.push(info);
+    })
+
+    ret['tp'] = getStringOut('图片', imgPackageData);
+    ret['jbxx'] = getKeyValueOut('基本信息', jbxxPackageData);
+
+    let fwzyPackageData = keyValuePackage(excelData['服务资源'].dataList);
+    ret['fwzy'] = getKeyValueOut('服务资源', fwzyPackageData);
+
+    let dldxlTableData = tablePackage(excelData['大龄低学历人员'].headerList[0], excelData['大龄低学历人员'].bodyList);
+    ret['dldxlry'] = getTableOut('大龄低学历人员', dldxlTableData);
+
+    let jyknryTableData = tablePackage(excelData['就业困难人员'].headerList[0], excelData['就业困难人员'].bodyList);
+    ret['jyknry'] = getTableOut('就业困难人员', jyknryTableData);
+    
+    let tysbTableData = tablePackage(excelData['退役士兵'].headerList[0], excelData['退役士兵'].bodyList);
+    ret['tysb'] = getTableOut('退役士兵', tysbTableData);
+    
+    let yjbysTableData = tablePackage(excelData['应届毕业生'].headerList[0], excelData['应届毕业生'].bodyList);
+    ret['yjbys'] = getTableOut('应届毕业生', yjbysTableData);
+    
+    let cqsyryTableData = tablePackage(excelData['长期失业人员'].headerList[0], excelData['长期失业人员'].bodyList);
+    ret['cqsyry'] = getTableOut('长期失业人员', cqsyryTableData);
+    
+    let zdryTableData = tablePackage(excelData['征地人员'].headerList[0], excelData['征地人员'].bodyList);
+    ret['zdry'] = getTableOut('征地人员', zdryTableData);
+
+    res.send(ret);
+}
\ No newline at end of file

src/biz/jcsj.ts

@@ -61,8 +61,26 @@ export function getData(req, res) {
     let jyfwPackageData = keyValuePackage(excelData['就业服务'].dataList);
     ret['jyfw'] = getKeyValueOut('就业服务', jyfwPackageData);
 
-    let jpfwTableData = tablePackage(excelData["技培服务"].headerList[0], excelData["技培服务"].bodyList);
-    ret['jpfw'] = getTableOut( '技培服务', jpfwTableData);
+    let jpfwTableData = tablePackage(excelData['技培服务'].headerList[0], excelData['技培服务'].bodyList);
+    ret['jpfw'] = getTableOut('技培服务', jpfwTableData);
+
+    let cjyjsPackageData = keyValuePackage(excelData['创就业集市'].dataList);
+    ret['cjyjs'] = getKeyValueOut('创就业集市', cjyjsPackageData);
+
+    let cyxtPackageData = keyValuePackage(excelData['创业学堂'].dataList);
+    ret['cyxt'] = getKeyValueOut('创业学堂', cyxtPackageData);
+
+    let hzfhqPackageData = keyValuePackage(excelData['合作孵化器'].dataList);
+    ret['hzfhq'] = getKeyValueOut('合作孵化器', hzfhqPackageData);
+
+    let cyfyPackageData = keyValuePackage(excelData['创业法苑'].dataList);
+    ret['cyfy'] = getKeyValueOut('创业法苑', cyfyPackageData);
+
+    let HRjylmPackageData = keyValuePackage(excelData['HR就业联盟'].dataList);
+    ret['HRjylm'] = getKeyValueOut('HR就业联盟', HRjylmPackageData);
+
+    let cyzjlbPackageData = keyValuePackage(excelData['创业者俱乐部'].dataList);
+    ret['cyzjlb'] = getKeyValueOut('创业者俱乐部', cyzjlbPackageData);
                      
     res.send(ret);
 } 
\ No newline at end of file

src/biz/map.ts

+import { cjwTableData, zdqyTableData } from "../data/table/jcsjData";
+import { onceYBarChartPackage, tablePackage } from "../dataPackage/inFrontOut";
+import { getOnceYBarChartOut, getTableOut } from "../dataPackage/out";
+
+export function getData(req, res) {
+    let cjwExcelData = cjwTableData();   //村居委地图数据
+    let zdqyExcelData = zdqyTableData();    //重点企业地图数据
+
+    let ret:any = {};
+
+    let cjwDataList = cjwExcelData['村居委数据'].dataList;
+    let cjwMap = {title: "村居委地图", dataList: cjwDataList};
+
+    ret["cjw"] = cjwMap;
+
+    let zdqyDataList = zdqyExcelData['重点合作企业数据'].dataList;
+    let zdqyMap = {title: "重点企业地图", dataList: zdqyDataList};
+
+    ret["zdqy"] = zdqyMap;
+
+    res.send(ret);
+}
\ No newline at end of file

src/biz/zdqy.ts

+import { get重点企业弹窗 } from "../data/table/jcsjData";
+import { keyValuePackage, tablePackage } from "../dataPackage/inFrontOut";
+import { getKeyValueOut, getStringOut, getTableOut } from "../dataPackage/out";
+
+export function getData(req, res) {
+    let name = req.query.name;
+    let excelData = get重点企业弹窗(name);
+
+    let ret:any = {};
+
+    let jbxxDataList = keyValuePackage(excelData['基础数据'].dataList);
+    let imgPackageData = [];
+    let jbxxPackageData = [];
+    jbxxDataList.forEach (info => {
+        let {key, value, unit} = info;
+        if (key == "图片") imgPackageData.push(info);
+        else jbxxPackageData.push(info);
+    })
+
+    ret['tp'] = getStringOut('图片', imgPackageData);
+    ret['jcsj'] = getKeyValueOut('基础数据', jbxxPackageData);
+
+    let zpxxTableData = tablePackage(excelData['招聘信息'].headerList[0], excelData['招聘信息'].bodyList);
+    ret['zpxx'] = getTableOut('招聘信息', zpxxTableData);
+
+    res.send(ret);
+}
\ No newline at end of file

src/data/table/jcsjData.ts

 
 import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../util/analysisExcel";
+import { excelBecomeOfBlockData, onceSheetBecomeOfblockData } from "../../util/analysisExcel";
 
 function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
     let result = {};
@@ -25,7 +25,7 @@ export function jcsjTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('高桥.xlsx', '基础数据');
 
-    let keyValueOrTitleList = ["左上数据","劳动年龄段人口概况","男女比例","失无业类型比例","失无业人员分析","服务资源","社区总体就业率","创业服务","就业服务"];//适配 饼图 键值以及需要多个key的
+    let keyValueOrTitleList = ["左上数据","劳动年龄段人口概况","男女比例","失无业类型比例","失无业人员分析","服务资源","社区总体就业率","创业服务","就业服务", "创就业集市", "创业学堂", "合作孵化器", "创业法苑", "HR就业联盟", "创业者俱乐部"];//适配 饼图 键值以及需要多个key的
     let barChartList = ["重点人员男女比例数据"]; //适配 柱状图 折线图 
     let stringList = [];
     let decollatePlanarList =["社区总体就业率详情","技培服务"];//适配 表格
@@ -33,6 +33,58 @@ export function jcsjTableData() {
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;    
+}
+
+export function cjwTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('高桥.xlsx', '地图村居委数据');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = ["村居委数据"];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+export function zdqyTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('高桥.xlsx', '地图重点合作企业数据');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = ["重点合作企业数据"];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
 
+export function get村居委弹窗(name) {
+    let 村居委弹窗数据 = excelBecomeOfBlockData("村居委弹窗.xlsx");
+    let dataList = 村居委弹窗数据[name];
 
+    let keyValueOrTitleList = ["浮窗数据", "基本信息", "服务资源"];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["大龄低学历人员", "就业困难人员", "退役士兵", "应届毕业生", "长期失业人员", "征地人员"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(dataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+export function get重点企业弹窗(name) {
+    let 重点企业弹窗数据 = excelBecomeOfBlockData("重点企业弹窗.xlsx");
+    let dataList = 重点企业弹窗数据[name];
+
+    let keyValueOrTitleList = ["基础数据"];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["招聘信息"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(dataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
 }
\ No newline at end of file

src/main.ts

@@ -13,6 +13,7 @@ async function lanuch() {
 }
 
 function test() {
+
 }
 
 lanuch();

src/routers/router.ts

@@ -2,11 +2,26 @@
 import * as asyncHandler from 'express-async-handler'
 
 import * as jcsjBiz from '../biz/jcsj';
+import * as mapBiz from '../biz/map';
+import * as cjwBiz from '../biz/cjw';
+import * as zdqyBiz from '../biz/zdqy';
         
 export function setRouter(httpServer){
     httpServer.post('/jcsj', asyncHandler(jcsjBiz.getData));
     
     httpServer.get('/jcsj', asyncHandler(jcsjBiz.getData));
 
+    httpServer.post('/map', asyncHandler(mapBiz.getData));
+    
+    httpServer.get('/map', asyncHandler(mapBiz.getData));
+
+    httpServer.post('/cjw', asyncHandler(cjwBiz.getData));
+    
+    httpServer.get('/cjw', asyncHandler(cjwBiz.getData));
+
+    httpServer.post('/zdqy', asyncHandler(zdqyBiz.getData));
+    
+    httpServer.get('/zdqy', asyncHandler(zdqyBiz.getData));
+        
 }
     
\ No newline at end of file