no message

package-lock.json

@@ -11,6 +11,7 @@
       "dependencies": {
         "@alicloud/sms-sdk": "^1.1.6",
         "@types/node": "^10.12.18",
+        "child_process": "^1.0.2",
         "compression": "^1.7.4",
         "exceljs": "^4.4.0",
         "express": "^4.17.1",
@@ -610,6 +611,11 @@
         "node": "*"
       }
     },
+    "node_modules/child_process": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/child_process/-/child_process-1.0.2.tgz",
+      "integrity": "sha512-Wmza/JzL0SiWz7kl6MhIKT5ceIlnFPJX+lwUGj7Clhy5MMldsSoJR0+uvRzOS5Kv45Mq7t1PoE8TsOA9bzvb6g=="
+    },
     "node_modules/codepage": {
       "version": "1.15.0",
       "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",

package.json

@@ -6,6 +6,7 @@
   "dependencies": {
     "@alicloud/sms-sdk": "^1.1.6",
     "@types/node": "^10.12.18",
+    "child_process": "^1.0.2",
     "compression": "^1.7.4",
     "exceljs": "^4.4.0",
     "express": "^4.17.1",

res/weixin.bat

+start D:\soft\WeChat\WechatAppLauncher.exe -launch_appid=wx2d511fd030c4f803
\ No newline at end of file

src/biz/jyfw.ts

@@ -8,7 +8,9 @@ import { keyValuePackage, onceYBarChartPackage, stringListPackage, tablePackage
 import { getKeyValueOut, getOnceYBarChartOut, getStringOut } from "../dataPackage/out";
 import { getConfData, getOneChange } from "../dataPackage/public";
 import { findImageOrFolderImages, findVideoOrFolderImages, readFileList } from "../dataPackage/tool";
-
+import { successResult } from "../tools/systemTools";
+const { execSync } = require('child_process');
+const path = require('path');
 
 /**
  * 主界面
@@ -64,7 +66,6 @@ export function getData(req, res) {
     })
     ret['hphxyy'] = {title:'湖畔汇·享业苑', dataList:hphxyyData};
 
-
     /**右屏 */
     let jyfwPackageData = keyValuePackage(excelData['就业服务'].dataList);
     ret['jyfw'] = getKeyValueOut('就业服务', jyfwPackageData);
@@ -135,6 +136,26 @@ export function getPopData(req, res) {
 }
 
 
+/**
+ * 启动微信小程序的bat文件
+ * @returns 
+ */
+export function runBat(req, res) {
+    let ret:any = {};
+    
+    let batPash = path.join(__dirname.substring(0,__dirname.indexOf("out")), "res", 'weixin.bat' );
+    try {
+        execSync(`cmd /c "${batPash}"`, { stdio: 'inherit' });
+        console.log('Batch file executed successfully');
+    } catch (error) {
+        console.error('Error executing batch file:', error);
+    }
+
+    ret = successResult();
+    
+    res.send(ret);
+}
+
 
 
 

src/biz/map.ts

@@ -17,6 +17,11 @@ export function getJyMap(req, res) {
 
     let mapDataList = mapExcelData["地图坐标点位"].dataList;
 
+    // mapDataList.forEach( info => {
+    //     if (info.ispop) info.ispop = true;
+    //     else info.ispop = false;
+    // })
+
     ret['map'] = {title: '地图坐标点位', dataList: mapDataList};
 
     res.send(ret);

src/biz/queryMachine.ts

@@ -30,9 +30,8 @@ const path = require('path');
                 let newStr = info[key].split("\r\n");
                 info[key] = newStr;
             }
-            qwJobData.push(info);
         }
-
+        qwJobData.push(info);
     })
 
     let qwJobInformation = {dataList: qwJobData, total: qwPostList['body']['TotalRecord']};
@@ -53,45 +52,61 @@ const path = require('path');
 
     let ret:any = {};
 
-    let oldConf = ['gsmc', 'zprs', 'gzdd', 'fbsj', 'lggw', 'tyjryx'];
-    let newConf = ['公司名称', '招聘人数', '工作地点', '发布时间', '零工岗位', '退役军人优先'];
+    let oldConf = ['gsmc', 'zprs', 'gzdd', 'lggw', 'tyjryx'];
+    let newConf = ['公司名称', '招聘人数', '工作地点', '零工岗位', '退役军人'];
 
     tableData['南汇新城镇招聘岗位信息'].dataList.sort((a, b) => {
         return Date.parse(b.fbsj) - Date.parse(a.fbsj);
     })
 
-    let jobTableDataList = change(oldConf, newConf, tableData['南汇新城镇招聘岗位信息'].dataList, '', 'gwmc');
-
     let jobTableData = [];
-    jobTableDataList.forEach(info => {
-        let {name, list} = info;
-        let recruit = {key:'招聘人数', value:0};
-        let lggw = {key:'零工岗位', value:''};``
-        let tyjr = {key:'退役军人', value:''};
-        for (let i = 0; i < list.length; i++) {
-            //招聘人数
-            if(isNaN(list[i][1].value)) {
-                recruit['value'] = list[i][1].value;
-            }
-            else recruit['value'] += parseInt(list[i][1].value);
-            //零工岗位
-            if(list[i][4].value) {
-                lggw['value'] = list[i][4].value;
-            }
-            //退役军人
-            if(list[i][5].value) {
-                tyjr['value'] = list[i][5].value;
-            }
+    tableData['南汇新城镇招聘岗位信息'].dataList.forEach(info => {
+        let dataList = [];
+        for (let i = 0; i < oldConf.length; i++) {
+            let value = "";
+            if (info[oldConf[i]]) value = info[oldConf[i]]
+            dataList.push({key:newConf[i], value});
         }
-        
-        let dataList = [list[0][0], recruit, list[0][2], list[0][3], lggw, tyjr];
-        jobTableData.push(dataList)
+
+        jobTableData.push({id:info.id, title:info.gwmc, dataList});
     })
 
+    // let jobTableDataList = change(oldConf, newConf, tableData['南汇新城镇招聘岗位信息'].dataList, '', 'gwmc');
+    // let jobTableDataList = change(oldConf, newConf, tableData['南汇新城镇招聘岗位信息'].dataList, '', '');
+
+    // let jobTableData = [];
+    // jobTableDataList.forEach(info => {
+    //     let {name, list} = info;
+    //     let recruit = {key:'招聘人数', value:0};
+    //     let lggw = {key:'零工岗位', value:''};``
+    //     let tyjr = {key:'退役军人', value:''};
+    //     for (let i = 0; i < list.length; i++) {
+    //         //招聘人数
+    //         if(isNaN(list[i][1].value)) {
+    //             recruit['value'] = list[i][1].value;
+    //             break;
+    //         }
+    //         else recruit['value'] += parseInt(list[i][1].value);
+    //         //零工岗位
+    //         if(list[i][3].value) {
+    //             lggw['value'] = list[i][4].value;
+    //         }
+    //         //退役军人
+    //         if(list[i][4].value) {
+    //             tyjr['value'] = list[i][4].value;
+    //         }
+    //     }
+        
+    //     let dataList = [list[0][0], recruit, list[0][2], lggw, tyjr];
+    //     jobTableData.push({title:list[0][5], dataList});
+    // })
+
     // console.log(jobTableData);
 
     ret['jobInformation'] = jobTableData;
 
+    
+
     res.send(ret);
 }
 
@@ -102,15 +117,15 @@ const path = require('path');
  * @param res 
  */
  export function getJobDetailed(req, res) {
-    let company = req.query.company;
-    if (!company) throw new BizError(ERRORENUM.参数错误, `缺失竖屏岗位详情===>company参数`);
+    let id = req.query.id;
+    if (!id) throw new BizError(ERRORENUM.参数错误, `缺失竖屏岗位详情===>id参数`);
     let tableData = employmentTableData();
 
     let ret:any = {};
 
     let oldConf = ['gwmc', 'gwyq', 'gwzz', 'xzdy', 'gzdd', 'lggw', 'tyjryx'];
     let newConf = ['招聘岗位', '岗位要求', '岗位职责', '工资待遇', '工作地点', '零工岗位', '退役军人优先'];
-    let jobDetailed = change(oldConf, newConf, tableData['南汇新城镇招聘岗位信息'].dataList, company, 'gsmc');
+    let jobDetailed = change(oldConf, newConf, tableData['南汇新城镇招聘岗位信息'].dataList, id, 'id');
 
     ret['jobDetailed'] = jobDetailed;
 
@@ -197,7 +212,34 @@ export function change(oldConf, newConf, dataList, name, subName){
     
     let data = {};
     dataList.forEach((subList) => {
-        if (reg.test(subList[subName])) {
+        if (subName == "id") {
+            if (name == subList[subName]) {
+                if (!data[subList['gsmc']]) data[subList['gsmc']] = [];
+                let gsList = [];
+                for(let i = 0; i < newConf.length; i++) {
+                    if (newConf[i] == "招聘进度") {
+                        gsList.push({
+                            key: newConf[i],
+                            value: '招聘中'
+                        })
+                    } if (newConf[i] == "岗位职责" || newConf[i] == "岗位要求") {
+                        let newStr = [];
+                        if(subList[oldConf[i]]) newStr = subList[oldConf[i]].split("\r\n");
+                        gsList.push({
+                            key: newConf[i],
+                            value: newStr
+                        })
+                    }
+                    else {
+                        gsList.push({
+                            key: newConf[i],
+                            value: subList[oldConf[i]] || ""
+                        })
+                    }
+                }
+                data[subList['gsmc']].push(gsList);
+            }
+        } else if (reg.test(subList[subName])) {
             if (!data[subList['gsmc']]) data[subList['gsmc']] = [];
             let gsList = [];
             for(let i = 0; i < newConf.length; i++) {

src/data/table/tableData.ts

@@ -140,6 +140,15 @@ export function jzfwPopTableData() {
  * 区网重点关注人群
  */
 export function qwZdgzrqTableData(zdgzrqConf, name) {
+    if (name == "东岸涟城居委") name = "东岸涟城一居委"
+    else if (name == "临港家园居委") name = "临港家园社区居委会"
+    else if (name == "农场居委") name = "农场社区居委会"
+    else if (name == "港口居委") name = "港口居委会"
+    else if (name == "果园居委") name = "果园居委会"
+    else if (name == "新芦居委") name = "新芦社区居委会"
+    else if (name == "海尚居委") name = "海尚社区居委会"
+    else if (name == "海芦居委") name = "海芦社区居委会"
+    else if (name == "海汇居委") name = "海汇社区居委会"
     let zdgzrqData = {};
     for (let i = 0; i < zdgzrqConf.length; i++) {
         let excelName = zdgzrqConf[i];
@@ -199,9 +208,9 @@ function getCjwData(data, name) {
         let info = data[i];
         // 匹配数组下标6（村居委名称）
         if (reg.test(info[6])) {
-            let xm = info[1].slice(0, 1) + "**";
-            let sfz = info[3].slice(0, 14) + "****";
-            let dz = info[8].slice(0, info[8].length-4) + "****";
+            let xm = info[1] ? info[1].slice(0, 1) + "**" : "";
+            let sfz = info[3] ? info[3].slice(0, 14) + "****" : "";
+            let dz = info[8] ? info[8].slice(0, info[8].length-4) + "****" : "";
             let fwcs = getRandomInt(1, 5);
             result.push(
                 [

src/routers/router.ts

@@ -19,6 +19,8 @@ export function setRouter(httpServer){
     httpServer.post('/jyfw/map', asyncHandler(mapBiz.getJyMap));
     httpServer.post('/jyfw/pop', asyncHandler(jyfwBiz.getPopData));
 
+    httpServer.get('/jyfw/runbat', asyncHandler(jyfwBiz.runBat));
+
     httpServer.get('/jzfw/map', asyncHandler(mapBiz.getJzMap));
     httpServer.get('/jzfw', asyncHandler(jzfwBiz.getData));
     httpServer.get('/jzfw/pop', asyncHandler(jzfwBiz.getPopData));

src/tools/systemTools.ts

@@ -9,6 +9,15 @@ export function getUserToken(loginId:string) {
     return md5(`${loginId}_${Math.ceil(Math.random()*1000)}${new Date().valueOf()}`);
 }
 
+/**
+ * 返回编辑正确的结果
+ * @returns 
+ */
+ export function successResult() {
+    return {success:true}
+}
+
+
 export function getMySqlMs(time?) {
     time = time || new Date().valueOf();
     // time += (8*3600*1000);