From 34c1ad9576f83680d97d2ee25cab72d989209792 Mon Sep 17 00:00:00 2001 From: CODE <1650192445@qq.com> Date: Mon, 11 Sep 2023 15:01:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.vscode/launch.json | 64 ++++++++++++--------- api/app/lib/controllers/control/toolLink.js | 4 -- api/app/lib/controllers/project/group.js | 2 +- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 1d718a8..b1ea7a0 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -16,22 +16,30 @@ "-p 4600", "-f http://localhost:4600", // 研发 - "-g postgres://postgres:123@10.8.30.32:5432/orational_service", + // "-g postgres://postgres:123@10.8.30.32:5432/orational_service", // "-g postgres://postgres:123@10.8.30.166:5432/POMS_2306", + // "-g postgres://postgres:123@10.8.30.32:5432/poms1", // 测试 // "-g postgres://FashionAdmin:123456@10.8.30.156:5432/POMS", + "-g postgres://FashionAdmin:123456@10.8.30.166:5432/POMS", "-k 10.8.30.72:29092,10.8.30.73:29092,10.8.30.74:29092", "-e http://10.8.30.60:9200", // "-e http://10.8.30.60:5601", "--iotaProxy http://10.8.30.157:17007", + // "--redisHost localhost", "--redisPort 6379", + // + // "--redisHost https://redistest.anxinyun.cn", + // "--redisPort 6378", + // "--apMergeDeVeAnxinProjectId 1,2,3", "--axyApiUrl http://127.0.0.1:4100", // 测试 // "--apiEmisUrl http://10.8.30.161:1111", // "--apiEmisUrl http://10.8.30.161:31111/", - "--apiEmisUrl http://localhost:14000", + "--apiEmisUrl https://pepca-demo.anxinyun.cn/_api", + // "--apiEmisUrl http://localhost:14000", "--apiVcmpUrl http://localhost:4000", "--apiIotAuth http://localhost:4200", "--godUrl https://restapi.amap.com/v3", @@ -44,8 +52,8 @@ // "--qndmn http://resources.anxinyun.cn", // "--qndmn http://rhvqdivo5.hn-bkt.clouddn.com", // click 开发 - // "--clickHouseUrl http://10.8.30.95", - // "--clickHousePort 30123", + "--clickHouseUrl http://10.8.30.95", + "--clickHousePort 30123", // click 测试 // "--clickHouseUrl http://10.8.30.161", // "--clickHousePort 30123", @@ -59,20 +67,20 @@ // // // click 商用 - "--clickHouseUrl http://218.3.126.49", - "--clickHousePort 18123", - "--clickHouseUser default", - "--clickHousePassword Wbo@hi1I", - "--clickHouseAnxincloud anxinyun", - "--clickHousePepEmis pepca", - "--clickHouseProjectManage peppm", - "--clickHouseVcmp video_access_dev", - "--clickHouseDataAlarm alarm", - "--clickHouseIot iota", - "--clickHouseCamworkflow camworkflow", - "--confirmAlarmAnxinUserId 1", - "--vcmpAppId 5048b08d-c449-4d7f-b1ec-f741012aefe8", - "--vcmpAppSecret 5ba8c0ab-9fbd-4f07-9817-c48017c3cbad", + // "--clickHouseUrl http://218.3.126.49", + // "--clickHousePort 18123", + // "--clickHouseUser default", + // "--clickHousePassword Wbo@hi1I", + // "--clickHouseAnxincloud anxinyun", + // "--clickHousePepEmis pepca", + // "--clickHouseProjectManage peppm", + // "--clickHouseVcmp video_access_dev", + // "--clickHouseDataAlarm alarm", + // "--clickHouseIot default", + // "--clickHouseCamworkflow camworkflow", + // "--confirmAlarmAnxinUserId 1", + // "--vcmpAppId 5048b08d-c449-4d7f-b1ec-f741012aefe8", + // "--vcmpAppSecret 5ba8c0ab-9fbd-4f07-9817-c48017c3cbad", // // // 似乎不能传空 先注释 * 2 @@ -86,16 +94,16 @@ // "--clickHouseDataAlarm default", // "--clickHouseIot iot", // 测试 - // "--clickHouseAnxincloud anxinyun", - // "--clickHousePepEmis pepca", - // "--clickHouseProjectManage peppm", - // "--clickHouseVcmp video_access_dev", - // "--clickHouseDataAlarm default", - // "--clickHouseIot iota", - // "--clickHouseCamworkflow camworkflow", - // "--confirmAlarmAnxinUserId 1", - // "--vcmpAppId 5048b08d-c449-4d7f-b1ec-f741012aefe8", - // "--vcmpAppSecret 5ba8c0ab-9fbd-4f07-9817-c48017c3cbad", + "--clickHouseAnxincloud anxinyun88", + "--clickHousePepEmis pepca8", + "--clickHouseProjectManage peppm8", + "--clickHouseVcmp video_access_dev", + "--clickHouseDataAlarm alarm", + "--clickHouseIot iota", + "--clickHouseCamworkflow camworkflow", + "--confirmAlarmAnxinUserId 1", + "--vcmpAppId 5048b08d-c449-4d7f-b1ec-f741012aefe8", + "--vcmpAppSecret 5ba8c0ab-9fbd-4f07-9817-c48017c3cbad", ] }, { diff --git a/api/app/lib/controllers/control/toolLink.js b/api/app/lib/controllers/control/toolLink.js index 0f878b2..5e239dd 100644 --- a/api/app/lib/controllers/control/toolLink.js +++ b/api/app/lib/controllers/control/toolLink.js @@ -226,7 +226,6 @@ async function count (ctx) { let dataAfter = new moment(); //验证后时间 let dataduration = moment.duration(dataAfter.diff(dataFront))._data.milliseconds - console.log('数据', dataduration); let yingyongFront = new moment(); //验证前时间 @@ -248,7 +247,6 @@ async function count (ctx) { let yingyongAfter = new moment(); //验证后时间 let yingyongduration = moment.duration(yingyongAfter.diff(yingyongFront))._data.milliseconds - console.log('应用', yingyongduration); let videoFront = new moment(); //验证前时间 @@ -362,8 +360,6 @@ async function count (ctx) { let videoAfter = new moment(); //验证后时间 let videoduration = moment.duration(videoAfter.diff(videoFront))._data.milliseconds - console.log('视频', videoduration); - let findOptions = { where: { diff --git a/api/app/lib/controllers/project/group.js b/api/app/lib/controllers/project/group.js index 5714264..492b87b 100644 --- a/api/app/lib/controllers/project/group.js +++ b/api/app/lib/controllers/project/group.js @@ -223,7 +223,7 @@ async function groupStatistic (ctx) { group by StructureId ` ).toPromise() : [] - // console.log('',) + let rslt = [] for (let pg of progectGroupList) { let strucCount = 0