fuyu 4 lat temu
rodzic
commit
c70d07db05
5 zmienionych plików z 189 dodań i 10 usunięć
  1. 3 3
      merge.config.js
  2. 88 0
      move.sh
  3. 81 0
      pacs.sh
  4. 6 4
      src/modules/api/controller.js
  5. 11 3
      src/service/move.js

+ 3 - 3
merge.config.js

@@ -2,8 +2,8 @@
  * @Author: fuyu
  * @Date: 2021-03-23 11:56:31
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-24 15:24:02
- * @FilePath: /sql_merge/merge.config.js
+ * @LastEditTime: 2021-03-25 16:43:59
+ * @FilePath: /202103/code/sql_merge/merge.config.js
  */
 /**
  * PM2启动配置
@@ -21,7 +21,7 @@ module.exports = {
 
       max_memory_restart: '2G', //超过多大内存自动重启,仅防止内存泄露有意义,需要根据自己的业务设置
       exec_mode: 'cluster', //开启多线程模式,用于负载均衡
-      instances: '2', //启用多少个实例,可用于负载均衡
+      instances: '8', //启用多少个实例,可用于负载均衡
       autorestart: true, //程序崩溃后自动重启
 
       env: { NODE_ENV: 'production' },

+ 88 - 0
move.sh

@@ -0,0 +1,88 @@
+curl -d 'institution_id=73090001' 127.0.0.1:22399/api/move &
+###
+ # @Author: fuyu
+ # @Date: 2021-03-25 16:44:08
+ # @LastEditors: fuyu
+ # @LastEditTime: 2021-03-25 16:50:21
+ # @FilePath: /202103/code/sql_merge/curl.sh
+### 
+curl -d 'institution_id=73090002' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090003' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090004' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090005' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090006' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090007' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090008' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090010' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090011' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090012' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090013' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090014' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090015' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090016' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090017' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090018' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090019' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090020' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090021' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090022' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090023' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090025' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090026' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090027' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090028' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090029' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090030' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090031' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090032' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090033' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090034' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090035' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090036' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090037' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090038' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090039' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090040' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090041' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090042' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090043' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090044' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090045' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090046' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090047' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090048' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090049' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090050' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090051' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090052' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090053' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090054' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090055' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090056' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090057' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090058' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090059' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090060' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090061' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090062' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090063' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090064' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090065' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090066' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090067' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090068' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090069' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090070' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090071' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090072' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090073' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090074' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090075' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090076' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090077' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090078' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090079' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090080' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090081' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090082' 127.0.0.1:22399/api/move &
+curl -d 'institution_id=73090083' 127.0.0.1:22399/api/move &

+ 81 - 0
pacs.sh

@@ -0,0 +1,81 @@
+curl -d 'institution_id=73090001' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090002' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090003' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090005' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090007' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090008' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090011' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090012' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090013' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090014' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090015' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090016' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090017' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090018' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090019' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090020' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090021' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090022' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090023' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090025' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090026' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090027' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090028' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090029' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090030' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090031' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090032' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090033' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090034' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090035' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090036' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090037' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090038' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090039' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090040' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090041' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090042' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090043' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090044' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090045' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090046' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090047' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090048' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090049' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090050' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090051' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090052' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090053' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090054' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090055' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090056' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090057' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090058' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090059' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090060' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090061' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090062' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090063' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090064' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090065' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090066' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090067' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090068' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090069' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090070' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090071' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090072' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090073' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090074' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090075' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090076' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090077' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090078' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090079' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090080' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090081' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090082' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090083' 127.0.0.1:22399/api/pacs &

+ 6 - 4
src/modules/api/controller.js

@@ -2,14 +2,16 @@
  * @Author: fuyu
  * @Date: 2021-03-23 11:56:31
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-24 15:12:09
- * @FilePath: /sql_merge/src/modules/api/controller.js
+ * @LastEditTime: 2021-03-25 16:46:43
+ * @FilePath: /202103/code/sql_merge/src/modules/api/controller.js
  */
 import {moveAll, movePacs} from '../../service/move'
 export async function move(ctx) {
-  await moveAll()
+  const institution_id = ctx.request.body.institution_id
+  await moveAll(institution_id)
 }
 
 export async function pacs(ctx) {
-  await movePacs()
+  const institution_id = ctx.request.body.institution_id
+  await movePacs(institution_id)
 }

+ 11 - 3
src/service/move.js

@@ -2,7 +2,7 @@
  * @Author: fuyu
  * @Date: 2021-03-23 12:00:09
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-25 13:07:43
+ * @LastEditTime: 2021-03-25 16:47:37
  * @FilePath: /202103/code/sql_merge/src/service/move.js
  */
 
@@ -16,14 +16,22 @@ import {logSum, logSingle} from './log'
 import {RemoteApplication as OldRemoteApplication, ApplicationProgressLog as OldApplicationProgressLog, Bbs as OldBbs, RemoteOrder as OldRemoteOrder, RemoteWater as OldRemoteWater, Register as OldRegister, Exams as OldExams, PatientInfos as OldPatientInfos, Studies as OldStudies, Series as OldSeries, Images as OldImages, Report as OldReport, ReportRecord as OldReportRecord, QualityControl as OldQualityControl, QualityCause as OldQualityCause} from '../dao_old'
 import {Institution,  RemoteApplication as NewRemoteApplication, ApplicationProgressLog as NewApplicationProgressLog, Bbs as NewBbs, RemoteOrder as NewRemoteOrder, RemoteWater as NewRemoteWater, Register as NewRegister, Exams as NewExams, PatientInfos as NewPatientInfos, Studies as NewStudies, Series as NewSeries, Images as NewImages, Report as NewReport, ReportRecord as NewReportRecord, QualityControl as NewQualityControl, QualityCause as NewQualityCause} from '../dao_new'
 
-export async function moveAll() {
+export async function moveAll(institution_id) {
+  if(institution_id) {
+    await moveSingle(institution_id)
+    return
+  }
   const ids = await Institution.findAll({attributes: ['id']})
   for(let i = 0; i < ids.length; i++) {
     await moveSingle(ids[i]['id'])
   }
 }
 
-export async function movePacs() {
+export async function movePacs(institution_id) {
+  if(institution_id) {
+    await moveSinglePacs(institution_id)
+    return
+  }
   const ids = await Institution.findAll({attributes: ['id']})
   for(let i = 0; i < ids.length; i++) {
     await moveSinglePacs(ids[i]['id'])