fuyu hace 4 años
padre
commit
78c8a65213

+ 10 - 2
config/env/development.js

@@ -2,8 +2,8 @@
  * @Author: fuyu
  * @Date: 2019-12-12 18:12:16
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-26 16:42:03
- * @FilePath: /202103/code/sql_merge/config/env/development.js
+ * @LastEditTime: 2021-03-30 23:04:44
+ * @FilePath: /project/sql_merge/config/env/development.js
  */
 export default {
   token: 'secret-jwt-token',
@@ -24,6 +24,14 @@ export default {
     port: 7001,
     db_type: 'mysql',
   },
+  by_old_db_config: {
+    database: 'pacsonline',
+    username: 'pacs',
+    password: 'Zskk@2019~!@#',
+    host: '127.0.0.1',
+    port: 3306,
+    db_type: 'mysql'
+  },
   new_db_config: {
 
     // database: 'pacsonline_pro',

+ 10 - 2
config/env/production.js

@@ -2,8 +2,8 @@
  * @Author: fuyu
  * @Date: 2019-12-12 18:12:16
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-26 11:12:21
- * @FilePath: /202103/code/sql_merge/config/env/production.js
+ * @LastEditTime: 2021-03-30 23:04:54
+ * @FilePath: /project/sql_merge/config/env/production.js
  */
 export default {
   token: 'secret-jwt-token',
@@ -30,6 +30,14 @@ export default {
     port: 3306,
     db_type: 'mysql',
   },
+  by_old_db_config: {
+    database: 'pacsonline',
+    username: 'pacs',
+    password: 'Zskk@2019~!@#',
+    host: '127.0.0.1',
+    port: 3306,
+    db_type: 'mysql'
+  },
   // 'hostname'        => '10.46.2.149',
   // // 数据库名
   // 'database'        => 'pacsonline_pro',

+ 30 - 0
src/dao_by_new/db/sequelize.js

@@ -0,0 +1,30 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-22 18:46:15
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-30 23:03:30
+ * @FilePath: /project/sql_merge/src/dao_by_new/db/sequelize.js
+ */
+import Sequelize from 'sequelize'
+import config from '../../../config'
+const DB = config['new_db_config']
+
+export default new Sequelize(DB.database, DB.username, DB.password, {
+  host: DB.host,
+  port: DB.port,
+  dialect: DB.db_type,
+
+  dialectOptions: {
+    charset: 'utf8mb4',
+    // collate: 'utf8mb4_unicode_520_ci',
+    bigNumberStrings: true,
+    supportBigNumbers: true
+  },
+
+  pool: {
+    max: 50,
+    min: 10,
+    idle: 10000
+  },
+  timezone: '+08:00' //修改时区为东八区
+})

+ 35 - 0
src/dao_by_new/image.js

@@ -0,0 +1,35 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-30 22:55:24
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-30 22:56:00
+ * @FilePath: /project/sql_merge/src/dao_by_new/db/image.js
+ */
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-22 19:10:00
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-22 19:44:50
+ * @FilePath: /202103/code/test/tmp/Images.js
+ */
+
+const Sequelize = require('sequelize');
+import sequelize from './db/sequelize';
+/**
+* 患者信息
+*/
+// primaryKey: true
+// defaultValue: null
+const Images = sequelize.define('images', {
+  id: {type: Sequelize.STRING(32), allowNull: false, primaryKey: true}, // id,
+  imageId: {type: Sequelize.STRING(255), allowNull: true, defaultValue: null}, // imageId, 影像ID
+  metadata: {type: Sequelize.STRING(255), allowNull: true, defaultValue: null}, // metadata,
+}, {
+  freezeTableName: true,
+  charset: 'utf8',
+  indexes:[
+    {fields : ['imageId']}
+  ],
+});
+Images.sync({ force: false }).then(function() {});
+export default Images;

+ 11 - 0
src/dao_by_new/index.js

@@ -0,0 +1,11 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-30 22:46:39
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-30 23:02:56
+ * @FilePath: /project/sql_merge/src/dao_by_new/index.js
+ */
+import Images from './image'
+export {
+  Images
+}

+ 30 - 0
src/dao_by_old/db/sequelize.js

@@ -0,0 +1,30 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-22 18:46:15
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-30 23:03:41
+ * @FilePath: /project/sql_merge/src/dao_by_old/db/sequelize.js
+ */
+import Sequelize from 'sequelize'
+import config from '../../../config'
+const DB = config['by_old_db_config']
+
+export default new Sequelize(DB.database, DB.username, DB.password, {
+  host: DB.host,
+  port: DB.port,
+  dialect: DB.db_type,
+
+  dialectOptions: {
+    charset: 'utf8mb4',
+    // collate: 'utf8mb4_unicode_520_ci',
+    bigNumberStrings: true,
+    supportBigNumbers: true
+  },
+
+  pool: {
+    max: 50,
+    min: 10,
+    idle: 10000
+  },
+  timezone: '+08:00' //修改时区为东八区
+})

+ 37 - 0
src/dao_by_old/image.js

@@ -0,0 +1,37 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-30 22:55:24
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-30 23:01:31
+ * @FilePath: /project/sql_merge/src/dao_by_old/image.js
+ */
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-22 19:10:00
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-22 19:44:50
+ * @FilePath: /202103/code/test/tmp/Images.js
+ */
+
+const Sequelize = require('sequelize');
+import sequelize from './db/sequelize';
+/**
+* 患者信息
+*/
+// primaryKey: true
+// defaultValue: null
+const Images = sequelize.define('images', {
+  id: {type: Sequelize.STRING(32), allowNull: false, primaryKey: true}, // id,
+  image_id: {type: Sequelize.STRING(255), allowNull: true, defaultValue: null}, // imageId, 影像ID
+  metadata: {type: Sequelize.STRING(255), allowNull: true, defaultValue: null}, // metadata,
+  image_status: {type: Sequelize.INTEGER(11), allowNull: true, defaultValue: 0}, // metadata,
+}, {
+  freezeTableName: true,
+  charset: 'utf8',
+  indexes:[
+    {fields : ['imageId']},
+    {fields : ['image_status']}
+  ],
+});
+Images.sync({ force: false }).then(function() {});
+export default Images;

+ 11 - 0
src/dao_by_old/index.js

@@ -0,0 +1,11 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-30 22:46:18
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-30 23:02:41
+ * @FilePath: /project/sql_merge/src/dao_by_old/index.js
+ */
+import Images from './image'
+export {
+  Images
+}