no message

serverConfig.xml

@@ -5,7 +5,7 @@
         <port>27017</port>
         <w>1</w>
         <!-- <dataBase>baseDB</dataBase> -->
-        <dataBase>zjsc0227</dataBase>
+        <dataBase>zjsc0809</dataBase>
         <wtimeoutMS>30000</wtimeoutMS>
     </mongodb>
     <!-- 小程序的secret 和 appid -->
@@ -25,5 +25,7 @@
         <!-- 初始化账号提示 -->
         <initPointOut>1729288</initPointOut>
     </sms>
-    <baidumap>KI1jEpifrEQtgr7ZJ2zAOKlUw1tme7Eb</baidumap>
+    <!-- <baidumap>KI1jEpifrEQtgr7ZJ2zAOKlUw1tme7Eb</baidumap> -->
+    <!-- <baidumap>QCxLry4y9BjIDRDIsGAerkcHrnrbo55I</baidumap> 夏-->
+    <baidumap>yvr5gS5rGO6tFfq3gERdRfzTRsguXG9T</baidumap>
 </config>

src/biz/admin/enterprise/enterprise.ts

@@ -656,3 +656,28 @@ export async function getEnterpriseTeamInfoList(uscc:string) {
     return {dataList};
 }
 
+
+/**
+ * 企业信息回显
+ * @param uscc 
+ */
+export async function enterpriseInfomation(uscc:string) {
+    //暂时回显名称
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+
+    let dataInfo = {
+        name:enterpriseInfo.name
+    }
+    return {dataInfo};
+}
+
+
+export async function updateEnterpriseInfomation(uscc:string, name:string) {
+    //暂时回显名称
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+    enterpriseInfo.name = name;
+
+    await enterpriseInfo.save();
+
+    return {isSuccess:true}
+}
\ No newline at end of file

src/biz/admin/enterprise/financing.ts

@@ -69,11 +69,11 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
 
 /**
  * 导出融资企业信息列表
- * @param monthData 数据月份 目前数据库没有该字段
+ * @param monthData 入库月份 目前数据库没有该字段
  * @param fuHuaQiName 所属孵化器 
  * @param industry 行业领域
  * @param fuHuaQiInvestment 孵化器是否参与投资
- * @param type 页数 
+ * @param type 类型 
  * @returns 
  */
 export async function outPutFinancingList(monthData:string, fuHuaQiName:string, industry, fuHuaQiInvestment:number, type:number, isFuHuaQi:boolean) {

src/data/enterprise/enterprise.ts

@@ -125,7 +125,13 @@ const enterpriseSchema = new Schema({
     jianJie:String,//企业简介
     dengJiJiGuan:String,//登记机关
     naShuiRenZiZhi:Number,//纳税人资质
-    zuiXinNianBaoNianFen:Number//最新年报年份
+    zuiXinNianBaoNianFen:Number,//最新年报年份
+    //经纬度
+    lng:String,//经度
+    lat:String,//纬度
+    //迁入前经纬度
+    oldLng:String,//经度
+    oldLat:String,//纬度
 });
 
 var enterpriseModel;
@@ -610,7 +616,8 @@ export async function statsFuHuaQiEnterpriseArea(fuHuaQiUscc:string) {
     let result = await enterpriseModel.aggregate([  
         {
             "$match":{
-                fuHuaQiUscc
+                fuHuaQiUscc,
+                state:{"$ne":4} 
             }
         },   
         {    
@@ -626,4 +633,34 @@ export async function statsFuHuaQiEnterpriseArea(fuHuaQiUscc:string) {
         }  
     ]);
     return result[0];
+}
+
+
+export async function repeatEnterprise() {
+    let result = await enterpriseModel.aggregate([  
+        {  
+            $group: {  
+                _id: "$uscc", // 按照email字段进行分组  
+                count: { $sum: 1 }, // 计算每个email出现的次数  
+            }  
+        },  
+        {  
+            $match: {  
+                count: { $gt: 1 } // 筛选出那些email出现次数大于1的分组  
+            }  
+        },  
+        {  
+            $project: {  
+                _id: 0, // 不需要_id字段  
+                uscc: "$_id", // 将_id字段重命名为email  
+                count: 1, // 显示count字段  
+            }  
+        }  
+    ]);
+    let usccList = [];
+    result.forEach(info => {
+        usccList.push(info.uscc);
+    });
+
+    return usccList;
 }
\ No newline at end of file

src/data/fuHuaQi/customTask.ts

@@ -76,3 +76,14 @@ export async function findCustomTaskCount(param) {
 export async function addTask(customTaskId:string, customTaskType:number, dataCycle:number, startMs:number, endMs:number ) {
     await customTaskModel.create({customTaskId, customTaskType, dataCycle, startMs, endMs, ct:new Date().valueOf()});
 }
+
+
+
+/**
+ * 获取最新月份
+ * @param param 
+ */
+export async function getNewMonthTask(customTaskType:number) {
+    let list = await customTaskModel.find({customTaskType}).sort({dataCycle:-1}).limit(1);
+    return list[0];
+}
\ No newline at end of file

src/main.ts

+import { test, zhenDuanBaoGao, 修复重复, 补充经纬度 } from "./biz/admin/provide";
 import { initPool } from "./biz/gpt/indicatorPool";
 import { initOutline } from "./biz/gpt/report";
 import { initSMS } from "./biz/sms";
@@ -24,7 +25,9 @@ async function lanuch() {
     /**创建http服务 */
     httpServer.createServer(systemConfig.port);
     console.log('This indicates that the server is started successfully.');
-
+    // await zhenDuanBaoGao();
+    // await 补充经纬度();
+    // await test();
     // await zhenDuanBaoGao();
 }
 

src/routers/admin/checkData.ts

+/**
+ * 管理后台端 数据校验
+ */
+
+import * as asyncHandler from 'express-async-handler';
+import { checkGuanWeiHuiToken } from '../../middleware/user';
+import { eccReqParamater } from '../../util/verificationParam';
+import { checkEnterpriseDataList, dwEnterpriseDataList, monthData, upCheckEnterpriseData } from '../../biz/admin/checkData/checkMonthData';
+
+
+export function setRouter(httpServer) {
+    httpServer.post('/admin/checkdata/list',checkGuanWeiHuiToken, asyncHandler(checkDataList));
+    httpServer.post('/admin/checkdata/list/dw',checkGuanWeiHuiToken, asyncHandler(dwCheckDataList));
+    httpServer.post('/admin/checkdata/list/check',checkGuanWeiHuiToken, asyncHandler(checkData));
+    httpServer.post('/admin/checkdata/monthdata/dw',checkGuanWeiHuiToken, asyncHandler(dwMonthDataList));
+}
+
+
+/**
+ * 校验数据列表
+ * @param req 
+ * @param res 
+ */
+async function checkDataList(req, res) {
+    let reqConf = {page: 'Number' };
+    const NotMustHaveKeys = [];
+    let {  page } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+
+    let result = await checkEnterpriseDataList(page);
+    res.success(result);
+}
+
+/**
+ * 下载校验数据
+ * @param req 
+ * @param res 
+ */
+async function dwCheckDataList(req, res) {
+
+    let result = await dwEnterpriseDataList();
+    res.success(result);
+}
+
+
+async function checkData(req, res) {
+    let reqConf = {dataList: '[Object]' };
+    const NotMustHaveKeys = [];
+    let {  dataList } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+
+    let result = await upCheckEnterpriseData(dataList);
+    res.success(result);
+}
+
+/**
+ * 下载校验数据
+ * @param req 
+ * @param res 
+ */
+async function dwMonthDataList(req, res) {
+
+    let result = await monthData();
+    res.success(result);
+}
+

src/routers/admin/enterprise.ts

@@ -32,6 +32,9 @@ export function setRouter(httpServer) {
     /**企业创始团队列表 */
     httpServer.post('/admin/enterprise/initialteam',checkGuanWeiHuiToken, asyncHandler(initialTeamList));
     httpServer.post('/admin/data/output/initialteam',checkGuanWeiHuiToken, asyncHandler(outPutEnterpriseInitialTeamList));   
+    /**企业名称编辑 */
+    httpServer.post('/admin/enterprise/info',checkGuanWeiHuiToken, asyncHandler(enterpriseInfo));
+    httpServer.post('/admin/enterprise/info/update',checkGuanWeiHuiToken, asyncHandler(updateEnterpriseInfo));
 }
 
 
@@ -313,4 +316,32 @@ async function outPutEnterpriseInitialTeamList(req, res) {
     let {dataList, fileName} = await enterpriseAdminBiz.outPutInitialTeamList(name, member, memberType, type, fuHuaQiUscc);
 
     res.success({data:dataList, name:`${fileName}企业创始团队数据.xlsx`});
-}
\ No newline at end of file
+}
+
+
+/**
+ * 企业信息回显
+ */
+async function enterpriseInfo(req, res) {
+    let reqConf = {uscc:"String"};
+    const NotMustHaveKeys = [];
+    let { uscc } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+
+    let restult = await enterpriseAdminBiz.enterpriseInfomation(uscc);
+
+    res.success(restult);
+}
+
+
+/**
+ * 企业信息修改
+ */
+async function updateEnterpriseInfo(req, res) {
+    let reqConf = {uscc:"String", name:"String"};
+    const NotMustHaveKeys = [];
+    let { uscc, name } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+   
+    let restult = await enterpriseAdminBiz.updateEnterpriseInfomation(uscc, name);
+
+    res.success(restult);
+}

src/routers/router.ts

@@ -43,6 +43,8 @@ import * as guanWeiHuiMobileClientUserRouters from './guanWeiHuiMobileClient/use
 
 import * as dangJianRouters from './mobileClient/dangJian';
 
+import * as checkDataRouters from './admin/checkData';
+
 export function setRouter(httpServer){
     /**下拉框等公用 路由 */
     publicRouters.setRouter(httpServer);
@@ -94,4 +96,7 @@ export function setRouter(httpServer){
 
     /**党建 */
     dangJianRouters.setRouter(httpServer);
+
+    /**数据校验 */
+    checkDataRouters.setRouter(httpServer);
 }
\ No newline at end of file

src/tools/transCode.ts

@@ -18,7 +18,8 @@ export async function addressIsInZJ(address) {
     }
     let reuslt:any = await get("https://api.map.baidu.com/geocoding/v3/", param);
     if (reuslt.status != 0 || !reuslt.result.location) {
-        throw new BizError("获取张江地址错误", reuslt.message, JSON.stringify(reuslt));
+        new BizError("获取张江地址错误", reuslt.message, JSON.stringify(reuslt));
+        return false;
     }
     let point = reuslt.result.location;//转换好的经纬度
 
@@ -39,24 +40,45 @@ export async function addressIsInZJ(address) {
     return isInside;  
 }
 
-// /**
-//  * 获取经纬度
-//  * @param address 
-//  * @param city 
-//  * @returns 
-//  */
-// export async function getAddressLatAndLng(address, city) {
-//     let param = {
-//         address:address,
-//         output:"json",
-//         ak:"tXZNOtuhb3PJHwax0eb7DkgHP9Zh5QOb",
-//     }
-//     let reuslt:any = await get("https://api.map.baidu.com/geocoding/v3/", param);
-//     if (reuslt.status == 0) {
-//         return reuslt.result.location
-//     }
-//     return {error:true, errMsg:reuslt.message||JSON.stringify(reuslt) };
-// }
+export async function latLngInZJ(lat:number, lng:number) {
+    let point = {lat, lng};
+    /**射线法判断是否属于各个范围 命中一个就返回true*/
+    let isInside = false; 
+    for (let k = 0; k < areaList.length; k++) {
+        let polygon:any = areaList[k];//单个区域
+
+        if(polygon[0].lat != polygon[polygon.length-1].lat || polygon[0].lng != polygon[polygon.length-1].lng) {
+            polygon.push(polygon[0]);
+        }
+
+        isInside = itemIsPointInPolygon(point, polygon);
+            
+        if (isInside) break;
+    }
+
+    return isInside; 
+}
+
+/**
+ * 获取经纬度
+ * @param address 
+ * @param city 
+ * @returns 
+ */
+export async function getAddressLatAndLng(address, city, uscc) {
+    let param = {
+        address:address,
+        output:"json",
+        city,
+        ak:systemConfig.ak,
+    }
+    let reuslt:any = await get("https://api.map.baidu.com/geocoding/v3/", param);
+    if (reuslt.status == 0) {
+        return reuslt.result.location
+    }
+    console.log(uscc, "失败", JSON.stringify(reuslt));
+    return {error:true, errMsg:reuslt.message||JSON.stringify(reuslt) };
+}
 
 // //使用射线法
 // export function isPointInPolygon(point) {