Skip to content

Z
zjxcxServer
Commit 1f9bb13e by lixinming
Options

优化2

parent f0ffe6bf
Showing with 133 additions and 125 deletions
serverConfig.xml
...@@ -25,4 +25,5 @@ ...@@ -25,4 +25,5 @@
<!-- 初始化账号提示 --> <!-- 初始化账号提示 -->
<initPointOut>1729288</initPointOut> <initPointOut>1729288</initPointOut>
</sms> </sms>
<baidumap>KI1jEpifrEQtgr7ZJ2zAOKlUw1tme7Eb</baidumap>
</config> </config>
src/biz/admin/provide.ts
...@@ -9,7 +9,7 @@ import * as enterpriseData from "../../data/enterprise/enterprise"; ...@@ -9,7 +9,7 @@ import * as enterpriseData from "../../data/enterprise/enterprise";
import * as scoreBiz from "../mobileFuHuaQi/fuHuaQi/score"; import * as scoreBiz from "../mobileFuHuaQi/fuHuaQi/score";
import * as fuhuaqiData from "../../data/fuHuaQi/fuhuaqi"; import * as fuhuaqiData from "../../data/fuHuaQi/fuhuaqi";
import * as financingData from "../../data/fuHuaQi/monthTask/financing"; import * as financingData from "../../data/fuHuaQi/monthTask/financing";
import { CHANGEMODE, ENTERPRISESIZE, FUHUASTATE, INDUSTRY, LISTINGSITUATION, MOVEOUTCAUSE, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, MOVEOUTTYPE, NASHUIRENZIZHI, RAS, SCOREWAYS, STATEENUM, TASKTYPEENUM, VIRTUALCAUSE } from "../../config/enum"; import { CHANGEMODE, CYCSRBJ, CYCXFX, ENTERPRISESIZE, FUHUASTATE, INDUSTRY, LISTINGSITUATION, MOVEOUTCAUSE, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, MOVEOUTTYPE, NASHUIRENZIZHI, RAS, SCOREWAYS, STATEENUM, TASKTYPEENUM, VIRTUALCAUSE } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum"; import { ERRORENUM } from "../../config/errorEnum";
import { findAllNotDisabledFuHuaQi, findFuHuaQiList } from "../../data/fuHuaQi/fuhuaqi"; import { findAllNotDisabledFuHuaQi, findFuHuaQiList } from "../../data/fuHuaQi/fuhuaqi";
import { BizError } from "../../util/bizError"; import { BizError } from "../../util/bizError";
...@@ -31,6 +31,10 @@ import { replenishMyEnterpriseInPutInfo, updateMoveOutInfo } from "../mobileFuHu ...@@ -31,6 +31,10 @@ import { replenishMyEnterpriseInPutInfo, updateMoveOutInfo } from "../mobileFuHu
import { findEnterpriseInitialTeamsByParam } from "../../data/enterprise/initialTeam"; import { findEnterpriseInitialTeamsByParam } from "../../data/enterprise/initialTeam";
import { count } from "console"; import { count } from "console";
import { onceSheetBecomeOfblockData } from "../../util/analysisExcel"; import { onceSheetBecomeOfblockData } from "../../util/analysisExcel";
import { findEnterpriseList } from "../../data/enterprise/enterprise";
import { extractData } from "../../util/piecemeal";
import { EnterpriseListConfig } from "../../config/splitResultConfig";
import { changeAddToString } from "../../tools/system";
import { changeEnumValue } from "../../util/verificationEnum"; import { changeEnumValue } from "../../util/verificationEnum";
const xlsx = require('node-xlsx'); const xlsx = require('node-xlsx');
...@@ -1616,4 +1620,114 @@ export async function t() { ...@@ -1616,4 +1620,114 @@ export async function t() {
} }
}); });
console.log(); console.log();
}
export async function test111() {
/**查询内容 */
let usccMap = await fuhuaqiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
let dataBaseList = await findEnterpriseList({labels:{"$elemMatch": { "labelId":"zfqy", "state":true }} } );
/**组合二维数组 titleList 与 keyList 要一一对应 */
const TitleList = [
"企业名称", "入库时间", "所属孵化器", "新注册/新迁入", "孵化状态", "虚拟孵化服务模式", "统一信用代码", "行业领域","主营业务",
"注册时间", "首次入孵时间", "迁入时间", "是否自然人控股", "迁入前注册地址",
"注册地址", "经营地址", "租赁面积（平方米）","创业创新方向","创业创始人背景",
"海外专利", "一类专利","二类专利",
"是否上市" , "高新技术" , "专精特新" , "小巨人培育" , "小巨人"
];//表头顺序 如果这里修改了 下面的keyList也要修改
const KeyList = [
"name", "createTime", "fuhuaqiUscc", "isCreate", "state", "virtualCause", "uscc", "industry", "mainBusiness",
"logonTime","firstIncubationTime", "timeOfImmigration", "isNaturalPersonHolding", "oldLogonAddress",
"logonAddress", "operatingAddress", "leasedArea","cycxfx","cycsrbj",
"alienPatent", "classIPatent", "secondClassPatent",
"beOnTheMarket", "highTechMs", "zjtxMs", "xjrpyMs", "xjrMs"
];//表头对应的字段顺序
let dataList = [TitleList];
dataBaseList.forEach( info => {
/**截取返回结果 */
let changeData:any = extractData(EnterpriseListConfig, info, true);
/**匹配所属孵化器名称 匹配不上时这里显示空字符串 */
changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
if (!info.taskId || info.enterpriseIsInPut) {
if (info.enterpriseIsInPut) changeData.isCreate = "底库数据";
else {
changeData.isCreate = (changeData.isCreate)? "补录新注册":"补录新迁入";
}
}else changeData.isCreate = (changeData.isCreate) ? "新注册" : "新迁入";
if (!changeAddToString(info.oldLogonAddress)) {
changeData.oldLogonAddress = "-";
}
if (!changeAddToString(info.logonAddress)) {
changeData.logonAddress = "-";
}
if (!changeAddToString(info.operatingAddress)) {
changeData.operatingAddress = "-";
}
changeData.cycxfx = changeEnumValue(CYCXFX, changeData.cycxfx) || "未选择";
changeData.cycsrbj = changeEnumValue(CYCSRBJ, changeData.cycsrbj) || "未选择";
changeData.isNaturalPersonHolding = changeData.isNaturalPersonHolding ? "是" : "否";
/**修改枚举值 */
changeData.industry = changeEnumValue(INDUSTRY, changeData.industry);
changeData.state = changeEnumValue(FUHUASTATE, changeData.state);
changeData.virtualCause = changeEnumValue(VIRTUALCAUSE, changeData.virtualCause);
/**- let intellectualProperty = changeData.intellectualProperty || {}
changeData.alienPatent = intellectualProperty.alienPatent || 0;
changeData.classIPatent = intellectualProperty.classIPatent || 0;
changeData.secondClassPatent = intellectualProperty.secondClassPatent || 0;
if (changeData.qualification) {
let onceData = changeData.qualification;
let beOnTheMarket = "无上市";
if (onceData.beOnTheMarket){
beOnTheMarket = verificationEnumTools.changeEnumValue( configEnum.FINANCINGROUNDS, onceData.beOnTheMarket) || "无上市"
}
changeData.beOnTheMarket = beOnTheMarket;
changeData.highTechMs = onceData.highTechMs ? new Date(onceData.highTechMs).getFullYear() : '未认证';//高新技术
changeData.zjtxMs = onceData.zjtxMs ? new Date(onceData.zjtxMs).getFullYear() : '未认证';//专精特新
changeData.xjrpyMs = onceData.xjrpyMs ? new Date(onceData.xjrpyMs).getFullYear() : '未认证';//小巨人培育
changeData.xjrMs = onceData.xjrMs ? new Date(onceData.xjrMs).getFullYear() : '未认证';//小巨人
} else {
changeData.beOnTheMarket = "无上市";//是否上市
changeData.highTechMs = '未认证';//高新技术
changeData.zjtxMs = '未认证';//专精特新
changeData.xjrpyMs = '未认证';//小巨人培育
changeData.xjrMs = '未认证';//小巨人
}
/**根据表头与key的顺序 生成小数组 */
let subList = [];
KeyList.forEach( keyStr => {
let value = changeData[keyStr];
if (value == null || value == undefined) value = "-"
subList.push( value );
});
dataList.push(subList);
});
let data = [
{
name:"sheet1",
data:dataList
}
];
let buff = xlsx.build(data);
fs.writeFileSync(path.join(__dirname.substring(0,__dirname.indexOf("out")), "res", '在孵企业excel.xlsx' ), buff);
console.log();
// return dataList;
} }
\ No newline at end of file
src/biz/label.ts
...@@ -407,8 +407,6 @@ export async function initSystemLabelData() { ...@@ -407,8 +407,6 @@ export async function initSystemLabelData() {
} }
/** /**
* 企业事件标签 * 企业事件标签
* 事件标签都是系统标签 * 事件标签都是系统标签
......
src/biz/systemTask.ts
...@@ -11,140 +11,26 @@ import moment = require("moment"); ...@@ -11,140 +11,26 @@ import moment = require("moment");
import { findTaskCountByParamCount, findTaskListByParam } from "../data/fuHuaQi/monthTask/task"; import { findTaskCountByParamCount, findTaskListByParam } from "../data/fuHuaQi/monthTask/task";
import * as taskTool from "../tools/taskTool"; import * as taskTool from "../tools/taskTool";
import { provideMonthTask, retrieveMonthTask } from "./mobileFuHuaQi/fuHuaQi/task/monthTask"; import { provideMonthTask, retrieveMonthTask } from "./mobileFuHuaQi/fuHuaQi/task/monthTask";
import { findAllFuHuaQiOperationNameMap, findFuHuaQiList } from "../data/fuHuaQi/fuhuaqi"; import { findFuHuaQiList } from "../data/fuHuaQi/fuhuaqi";
import { sendTaskPointOut } from "./sms"; import { sendTaskPointOut } from "./sms";
import { logHandle } from "../util/log"; import { logHandle } from "../util/log";
import { createSmsPointOutData, findSmsPointOutData } from "../data/fuHuaQi/smsPointOut"; import { createSmsPointOutData, findSmsPointOutData } from "../data/fuHuaQi/smsPointOut";
import { CYCSRBJ, CYCXFX, FUHUASTATE, INDUSTRY, SMSTYPE, VIRTUALCAUSE } from "../config/enum"; import { SMSTYPE } from "../config/enum";
import { dataDeclarationTask } from "./mobileEnterprise/quarterTask/dataDeclaration"; import { dataDeclarationTask } from "./mobileEnterprise/quarterTask/dataDeclaration";
import { findQuarterTaskCountByParam } from "../data/fuHuaQi/quarterTask/quarterTask"; import { findQuarterTaskCountByParam } from "../data/fuHuaQi/quarterTask/quarterTask";
import { provideFuHuaQiQuarterTask } from "./mobileFuHuaQi/fuHuaQi/task/quarterTask"; import { provideFuHuaQiQuarterTask } from "./mobileFuHuaQi/fuHuaQi/task/quarterTask";
import { initSystemLabelData, systemLabel } from "./label"; import { initSystemLabelData, systemLabel } from "./label";
import { findEnterpriseList } from "../data/enterprise/enterprise"; const os = require('os');
import { extractData } from "../util/piecemeal";
import { EnterpriseListConfig } from "../config/splitResultConfig";
import { changeAddToString } from "../tools/system";
import { changeEnumValue } from "../util/verificationEnum";
const xlsx = require('node-xlsx');
const fs = require('fs');
const path = require('path');
export async function test111() {
return
/**查询内容 */
let usccMap = await findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
let dataBaseList = await findEnterpriseList({labels:{"$elemMatch": { "labelId":"zfqy", "state":true }} } );
/**组合二维数组 titleList 与 keyList 要一一对应 */
const TitleList = [
"企业名称", "入库时间", "所属孵化器", "新注册/新迁入", "孵化状态", "虚拟孵化服务模式", "统一信用代码", "行业领域","主营业务",
"注册时间", "首次入孵时间", "迁入时间", "是否自然人控股", "迁入前注册地址",
"注册地址", "经营地址", "租赁面积（平方米）","创业创新方向","创业创始人背景",
"海外专利", "一类专利","二类专利",
"是否上市" , "高新技术" , "专精特新" , "小巨人培育" , "小巨人"
];//表头顺序 如果这里修改了 下面的keyList也要修改
const KeyList = [
"name", "createTime", "fuhuaqiUscc", "isCreate", "state", "virtualCause", "uscc", "industry", "mainBusiness",
"logonTime","firstIncubationTime", "timeOfImmigration", "isNaturalPersonHolding", "oldLogonAddress",
"logonAddress", "operatingAddress", "leasedArea","cycxfx","cycsrbj",
"alienPatent", "classIPatent", "secondClassPatent",
"beOnTheMarket", "highTechMs", "zjtxMs", "xjrpyMs", "xjrMs"
];//表头对应的字段顺序
let dataList = [TitleList];
dataBaseList.forEach( info => {
/**截取返回结果 */
let changeData:any = extractData(EnterpriseListConfig, info, true);
/**匹配所属孵化器名称 匹配不上时这里显示空字符串 */
changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
if (!info.taskId || info.enterpriseIsInPut) {
if (info.enterpriseIsInPut) changeData.isCreate = "底库数据";
else {
changeData.isCreate = (changeData.isCreate)? "补录新注册":"补录新迁入";
}
}else changeData.isCreate = (changeData.isCreate) ? "新注册" : "新迁入";
if (!changeAddToString(info.oldLogonAddress)) {
changeData.oldLogonAddress = "-";
}
if (!changeAddToString(info.logonAddress)) {
changeData.logonAddress = "-";
}
if (!changeAddToString(info.operatingAddress)) {
changeData.operatingAddress = "-";
}
changeData.cycxfx = changeEnumValue(CYCXFX, changeData.cycxfx) || "未选择";
changeData.cycsrbj = changeEnumValue(CYCSRBJ, changeData.cycsrbj) || "未选择";
changeData.isNaturalPersonHolding = changeData.isNaturalPersonHolding ? "是" : "否";
/**修改枚举值 */
changeData.industry = changeEnumValue(INDUSTRY, changeData.industry);
changeData.state = changeEnumValue(FUHUASTATE, changeData.state);
changeData.virtualCause = changeEnumValue(VIRTUALCAUSE, changeData.virtualCause);
/**- let intellectualProperty = changeData.intellectualProperty || {}
changeData.alienPatent = intellectualProperty.alienPatent || 0;
changeData.classIPatent = intellectualProperty.classIPatent || 0;
changeData.secondClassPatent = intellectualProperty.secondClassPatent || 0;
if (changeData.qualification) {
let onceData = changeData.qualification;
let beOnTheMarket = "无上市";
if (onceData.beOnTheMarket){
beOnTheMarket = verificationEnumTools.changeEnumValue( configEnum.FINANCINGROUNDS, onceData.beOnTheMarket) || "无上市"
}
changeData.beOnTheMarket = beOnTheMarket;
changeData.highTechMs = onceData.highTechMs ? new Date(onceData.highTechMs).getFullYear() : '未认证';//高新技术
changeData.zjtxMs = onceData.zjtxMs ? new Date(onceData.zjtxMs).getFullYear() : '未认证';//专精特新
changeData.xjrpyMs = onceData.xjrpyMs ? new Date(onceData.xjrpyMs).getFullYear() : '未认证';//小巨人培育
changeData.xjrMs = onceData.xjrMs ? new Date(onceData.xjrMs).getFullYear() : '未认证';//小巨人
} else {
changeData.beOnTheMarket = "无上市";//是否上市
changeData.highTechMs = '未认证';//高新技术
changeData.zjtxMs = '未认证';//专精特新
changeData.xjrpyMs = '未认证';//小巨人培育
changeData.xjrMs = '未认证';//小巨人
}
/**根据表头与key的顺序 生成小数组 */
let subList = [];
KeyList.forEach( keyStr => {
let value = changeData[keyStr];
if (value == null || value == undefined) value = "-"
subList.push( value );
});
dataList.push(subList);
});
let data = [
{
name:"sheet1",
data:dataList
}
];
let buff = xlsx.build(data);
fs.writeFileSync(path.join(__dirname.substring(0,__dirname.indexOf("out")), "res", '在孵企业excel.xlsx' ), buff);
console.log();
// return dataList;
}
/** /**
* 初始化系统定时任务 * 初始化系统定时任务
* *
*/ */
export async function initSystemTask() { export async function initSystemTask() {
const platform = os.platform();
if (platform == "win32") return;
// test111(); // test111();
// return // return
/** /**
......
src/config/serverConfig.ts
...@@ -16,7 +16,7 @@ export async function initConfig() { ...@@ -16,7 +16,7 @@ export async function initConfig() {
if (!configInfo || !configInfo.config) throw new BizError('xml中无配置'); if (!configInfo || !configInfo.config) throw new BizError('xml中无配置');
else { else {
let {port, mongodb, secret, getOpenIdUrl, appId, sms } = configInfo.config; let {port, mongodb, secret, getOpenIdUrl, appId, sms, baidumap } = configInfo.config;
systemConfig.port = parseInt(port[0]); systemConfig.port = parseInt(port[0]);
systemConfig.secret = secret[0]; systemConfig.secret = secret[0];
...@@ -38,6 +38,8 @@ export async function initConfig() { ...@@ -38,6 +38,8 @@ export async function initConfig() {
systemConfig.smsModelPointOut = smsInfo.pointOut[0]; systemConfig.smsModelPointOut = smsInfo.pointOut[0];
systemConfig.smsModelInitPointOut = smsInfo.initPointOut[0]; systemConfig.smsModelInitPointOut = smsInfo.initPointOut[0];
systemConfig.ak = baidumap[0];
} }
console.log("config init success"); console.log("config init success");
......
src/config/systemClass.ts
...@@ -18,4 +18,6 @@ export class ServerConfig { ...@@ -18,4 +18,6 @@ export class ServerConfig {
smsModelChangePwd:number; smsModelChangePwd:number;
smsModelPointOut:number; smsModelPointOut:number;
smsModelInitPointOut:number; smsModelInitPointOut:number;
/**百度地图api */
ak:string
} }
\ No newline at end of file
src/tools/transCode.ts
import { areaList } from "../config/area"; import { areaList } from "../config/area";
import { systemConfig } from "../config/serverConfig";
import { BizError } from "../util/bizError"; import { BizError } from "../util/bizError";
import { get } from "../util/request"; import { get } from "../util/request";
...@@ -11,7 +12,9 @@ export async function addressIsInZJ(address) { ...@@ -11,7 +12,9 @@ export async function addressIsInZJ(address) {
let param = { let param = {
address:address, address:address,
output:"json", output:"json",
ak:"tXZNOtuhb3PJHwax0eb7DkgHP9Zh5QOb", city:"上海市",
// ak:"tXZNOtuhb3PJHwax0eb7DkgHP9Zh5QOb",
ak:systemConfig.ak
} }
let reuslt:any = await get("https://api.map.baidu.com/geocoding/v3/", param); let reuslt:any = await get("https://api.map.baidu.com/geocoding/v3/", param);
if (reuslt.status != 0 || !reuslt.result.location) { if (reuslt.status != 0 || !reuslt.result.location) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment