fuyu 4 jaren geleden
bovenliggende
commit
f33db9f091
3 gewijzigde bestanden met toevoegingen van 49 en 12 verwijderingen
  1. 40 4
      pacs.sh
  2. 3 2
      src/modules/api/controller.js
  3. 6 6
      src/service/move.js

+ 40 - 4
pacs.sh

@@ -1,4 +1,40 @@
-curl -d 'institution_id=73090001' 127.0.0.1:22399/api/pacs &
-curl -d 'institution_id=73090004' 127.0.0.1:22399/api/pacs &
-curl -d 'institution_id=73090006' 127.0.0.1:22399/api/pacs &
-curl -d 'institution_id=73090010' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=0' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=0' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=0' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=0' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=1000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=1000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=1000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=1000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=2000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=2000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=2000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=2000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=3000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=3000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=3000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=3000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=4000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=4000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=4000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=4000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=5000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=5000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=5000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=5000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=6000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=6000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=6000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=6000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=7000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=7000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=7000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=7000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=8000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=8000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=8000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=8000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090001&offset=9000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090004&offset=9000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090006&offset=9000' 127.0.0.1:22399/api/pacs &
+curl -d 'institution_id=73090010&offset=9000' 127.0.0.1:22399/api/pacs &

+ 3 - 2
src/modules/api/controller.js

@@ -2,7 +2,7 @@
  * @Author: fuyu
  * @Date: 2021-03-23 11:56:31
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-25 16:46:43
+ * @LastEditTime: 2021-03-26 10:38:33
  * @FilePath: /202103/code/sql_merge/src/modules/api/controller.js
  */
 import {moveAll, movePacs} from '../../service/move'
@@ -13,5 +13,6 @@ export async function move(ctx) {
 
 export async function pacs(ctx) {
   const institution_id = ctx.request.body.institution_id
-  await movePacs(institution_id)
+  const offset = ctx.request.body.offset || 0
+  await movePacs(institution_id, offset)
 }

+ 6 - 6
src/service/move.js

@@ -2,7 +2,7 @@
  * @Author: fuyu
  * @Date: 2021-03-23 12:00:09
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-25 16:47:37
+ * @LastEditTime: 2021-03-26 10:38:18
  * @FilePath: /202103/code/sql_merge/src/service/move.js
  */
 
@@ -27,9 +27,9 @@ export async function moveAll(institution_id) {
   }
 }
 
-export async function movePacs(institution_id) {
+export async function movePacs(institution_id, offset) {
   if(institution_id) {
-    await moveSinglePacs(institution_id)
+    await moveSinglePacs(institution_id, offset)
     return
   }
   const ids = await Institution.findAll({attributes: ['id']})
@@ -41,14 +41,14 @@ export async function movePacs(institution_id) {
 const moveSinglePacs = async institution_id => {
   let count = limit, sum = 0
   while(count === limit) {
-    count = await moveExamsPacs(institution_id)
+    count = await moveExamsPacs(institution_id, offset)
     sum += count
   }
   logSum('pacs-' + institution_id, sum)
 }
 
-const moveExamsPacs = async (institution_id) => {
-  let exmas = await OldExams.findAll({where: {institution_id, flag: FLAG_REPORT}, limit, order})
+const moveExamsPacs = async (institution_id, offset) => {
+  let exmas = await OldExams.findAll({where: {institution_id, flag: FLAG_REPORT}, limit, order, offset})
   for(let i = 0; i < exmas.length; i++) {
     await moveExamPacs(exmas[i])
   }