zuihou_defaults zuihou_base更新和替换成 zuihou_defaults_yj zuihou_base_yj

imcs-admin-boot/docs/sql/1.先执行我,创建数据库.sql

@@ -1,3 +1,3 @@
-CREATE DATABASE IF NOT EXISTS `zuihou_defaults` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
-CREATE DATABASE IF NOT EXISTS `zuihou_base_0000` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+CREATE DATABASE IF NOT EXISTS `zuihou_defaults_yj` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+CREATE DATABASE IF NOT EXISTS `zuihou_base_yj_0000` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
 CREATE DATABASE IF NOT EXISTS `zuihou_column` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;

imcs-admin-boot/docs/sql/zuihou_base_0000.sql

@@ -5,7 +5,7 @@
  Source Server Type    : MySQL
  Source Server Version : 50722
  Source Host           : 127.0.0.1:3306
- Source Schema         : zuihou_base_0000
+ Source Schema         : zuihou_base_yj_0000
 
  Target Server Type    : MySQL
  Target Server Version : 50722

imcs-admin-boot/docs/sql/zuihou_defaults.sql

@@ -5,7 +5,7 @@
  Source Server Type    : MySQL
  Source Server Version : 50722
  Source Host           : 127.0.0.1:3306
- Source Schema         : zuihou_defaults
+ Source Schema         : zuihou_defaults_yj
 
  Target Server Type    : MySQL
  Target Server Version : 50722

imcs-admin-boot/docs/sql/脚本说明.md

@@ -15,30 +15,30 @@ zuihou:
 
 # 4个sql脚本的区别：
 1. zuihou_zipkin.sql: zipkin需要使用的数据库，无论使用那种模式，请独立创建 zuihou_zipkin 数据库，并导入 zuihou_zipkin.sql 
-2. zuihou_defaults.sql：默认库，用于存放全局表，如租户信息、定时信息等
-3. zuihou_base_0000.sql：租户库，用于存放内置租户：0000 的业务表。（跟 zuihou_column.sql 的区别在于没有 tenant_code 字段 ）
-4. zuihou_column.sql：租户库，用于存放所有租户的业务表。（跟 zuihou_base_0000.sql 的区别在于每个表都有 tenant_code 字段 ）
+2. zuihou_defaults_yj.sql：默认库，用于存放全局表，如租户信息、定时信息等
+3. zuihou_base_yj_0000.sql：租户库，用于存放内置租户：0000 的业务表。（跟 zuihou_column.sql 的区别在于没有 tenant_code 字段 ）
+4. zuihou_column.sql：租户库，用于存放所有租户的业务表。（跟 zuihou_base_yj_0000.sql 的区别在于每个表都有 tenant_code 字段 ）
 
 # 下面介绍4种模式如何创建数据库：(zuihou_zipkin.sql 4种模式都要单独导入 zuihou_zipin 库！)
 ## NONE
 1. 创建数据库： zuihou_none
-2. 向 zuihou_none 库导入 zuihou_defaults.sql 
-3. 向 zuihou_none 库导入 zuihou_base_0000.sql 
+2. 向 zuihou_none 库导入 zuihou_defaults_yj.sql 
+3. 向 zuihou_none 库导入 zuihou_base_yj_0000.sql 
 
 ## COLUMN
 1. 创建数据库： zuihou_column_all
-2. 向 zuihou_column_all 库导入 zuihou_defaults.sql 
+2. 向 zuihou_column_all 库导入 zuihou_defaults_yj.sql 
 3. 向 zuihou_column_all 库导入 zuihou_column.sql 
 
 ## SCHEMA
-1. 创建数据库： zuihou_defaults 和 zuihou_base_0000
-2. 向 zuihou_defaults 库导入 zuihou_defaults.sql 
-3. 向 zuihou_base_0000 库导入 zuihou_base_0000.sql 
+1. 创建数据库： zuihou_defaults_yj 和 zuihou_base_yj_0000
+2. 向 zuihou_defaults_yj 库导入 zuihou_defaults_yj.sql 
+3. 向 zuihou_base_yj_0000 库导入 zuihou_base_yj_0000.sql 
 
 ## DATASOURCE
-1. 创建数据库： zuihou_defaults 和 zuihou_base_0000
-2. 向 zuihou_defaults 库导入 zuihou_defaults.sql 
-3. 向 zuihou_base_0000 库导入 zuihou_base_0000.sql 
+1. 创建数据库： zuihou_defaults_yj 和 zuihou_base_yj_0000
+2. 向 zuihou_defaults_yj 库导入 zuihou_defaults_yj.sql 
+3. 向 zuihou_base_yj_0000 库导入 zuihou_base_yj_0000.sql 
 
 
 # 题外话：

imcs-admin-boot/imcs-authority-server/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ zuihou:
     ip: 127.0.0.1
     port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
-    database: zuihou_defaults
+    database: zuihou_defaults_yj
     username: root
     password: root
     url: jdbc:mysql://${zuihou.mysql.ip}:${zuihou.mysql.port}/${zuihou.mysql.database}?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true

imcs-admin-boot/imcs-authority-server/src/main/resources/application-docker.yml

@@ -17,7 +17,7 @@ zuihou:
     ip: 117.78.49.203
     port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
-    database: zuihou_defaults
+    database: zuihou_defaults_yj
     username: root
     password: mysqlPass2017
   database:

imcs-admin-boot/imcs-authority-server/src/main/resources/application-prod.yml

@@ -17,7 +17,7 @@ zuihou:
     ip: 127.0.0.1
     port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
-    database: zuihou_defaults
+    database: zuihou_defaults_yj
     username: root
     password: root
     url: jdbc:mysql://${zuihou.mysql.ip}:${zuihou.mysql.port}/${zuihou.mysql.database}?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true

imcs-admin-boot/imcs-authority-server/src/main/resources/sqls/zuihou_base.sql

@@ -5,7 +5,7 @@
  Source Server Type    : MySQL
  Source Server Version : 50722
  Source Host           : 127.0.0.1:3306
- Source Schema         : zuihou_base_0000
+ Source Schema         : zuihou_base_yj_0000
 
  Target Server Type    : MySQL
  Target Server Version : 50722

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BomProcedureTrayPositionMapper.xml

@@ -24,8 +24,8 @@
     </delete>
     
     <select id="getTrayPositionList" parameterType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTrayPosition" resultType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTrayPosition">
-        SELECT a.procedure_tray_id, a.tray_position_id,b.position_sort as positionSort FROM zuihou_base_0000.imcs_b_bom_procedure_tray_position a
-        LEFT JOIN zuihou_base_0000.imcs_t_tray_position b ON a.tray_position_id = b.id
+        SELECT a.procedure_tray_id, a.tray_position_id,b.position_sort as positionSort FROM zuihou_base_yj_0000.imcs_b_bom_procedure_tray_position a
+        LEFT JOIN zuihou_base_yj_0000.imcs_t_tray_position b ON a.tray_position_id = b.id
     </select>
 
 </mapper>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/RepairMapper.xml

@@ -59,9 +59,9 @@
         b.NAME AS productionresourceName,
         c.NAME AS lineDesc
         FROM
-        zuihou_base_0000.imcs_tenant_repair a
-        LEFT JOIN zuihou_base_0000.imcs_tenant_productionresource b ON a.productionresource_id = b.id
-        LEFT JOIN zuihou_base_0000.imcs_tenant_productionline c ON b.productionline_id = c.id
+        zuihou_base_yj_0000.imcs_tenant_repair a
+        LEFT JOIN zuihou_base_yj_0000.imcs_tenant_productionresource b ON a.productionresource_id = b.id
+        LEFT JOIN zuihou_base_yj_0000.imcs_tenant_productionline c ON b.productionline_id = c.id
         ) s ${ew.customSqlSegment}
     </select>
 
@@ -83,9 +83,9 @@
         b.NAME AS productionresourceName,
         c.NAME AS lineDesc
         FROM
-        zuihou_base_0000.imcs_tenant_repair a
-        LEFT JOIN zuihou_base_0000.imcs_tenant_productionresource b ON a.productionresource_id = b.id
-        LEFT JOIN zuihou_base_0000.imcs_tenant_productionline c ON b.productionline_id = c.id
+        zuihou_base_yj_0000.imcs_tenant_repair a
+        LEFT JOIN zuihou_base_yj_0000.imcs_tenant_productionresource b ON a.productionresource_id = b.id
+        LEFT JOIN zuihou_base_yj_0000.imcs_tenant_productionline c ON b.productionline_id = c.id
         where 1=1
         <if test="code != null and code != ''">
             and b.code = #{code}

imcs-admin-boot/imcs-jobs/imcs-jobs-server/src/main/resources/sqls/zuihou_base_0000.sql

@@ -5,7 +5,7 @@
  Source Server Type    : MySQL
  Source Server Version : 50722
  Source Host           : 127.0.0.1:3306
- Source Schema         : zuihou_base_0000
+ Source Schema         : zuihou_base_yj_0000
 
  Target Server Type    : MySQL
  Target Server Version : 50722

imcs-admin-boot/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/service/impl/ModulePanelServiceImpl.java

@@ -165,7 +165,7 @@ public class ModulePanelServiceImpl extends SuperCacheServiceImpl<ModulePanelMap
     @Override
     public List<Map> getAllTable() {
         Map map = new HashMap();
-        map.put("schema","zuihou_defaults");
+        map.put("schema","zuihou_defaults_yj");
         return modulePanelMapper.getAllTable(map);
     }
 

imcs-admin-boot/imcs-tenant-controller/src/main/java/com/github/zuihou/tenant/controller/ModulePanelController.java

@@ -73,7 +73,7 @@ public class ModulePanelController extends SuperCacheController<ModulePanelServi
     @PostMapping("/getFieldByTable")
     public R<List<Map>> getFieldByTable(@RequestBody TenantModulePanelSaveDTO model) {
         String tableName = model.getTableName();
-        return success(baseService.getFieldByTable(tableName,"zuihou_defaults"));
+        return success(baseService.getFieldByTable(tableName,"zuihou_defaults_yj"));
     }
 
     @ApiOperation(value = "根据id查询明细", notes = "根据id查询明细")

imcs-admin-boot/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/dto/DataSourceSaveDTO.java

@@ -21,7 +21,7 @@ public class DataSourceSaveDTO {
     private String driverClassName;
 
     @NotBlank
-    @ApiModelProperty(value = "JDBC url 地址", example = "jdbc:mysql://117.78.49.203:3306/zuihou_base_0000?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true")
+    @ApiModelProperty(value = "JDBC url 地址", example = "jdbc:mysql://117.78.49.203:3306/zuihou_base_yj_0000?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true")
     private String url;
 
     @NotBlank

imcs-admin-boot/imcs-wms-biz/src/main/resources/mapper_wms/base/WarehouseLogMapper.xml

@@ -42,7 +42,7 @@
             left join c_auth_user e on a.consignee_user_id = e.id
             left join imcs_wms_stock_info f on a.unique_code = f.unique_code
             left join imcs_wms_instock h on a.unique_code = h.unique_code
-            LEFT JOIN zuihou_base_0000.c_auth_user g ON a.create_user = g.id
+            LEFT JOIN zuihou_base_yj_0000.c_auth_user g ON a.create_user = g.id
         )s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-wms-biz/src/main/resources/mapper_wms/base/WmsInStockMapper.xml

@@ -49,9 +49,9 @@
         <include refid="Base_Column_List"></include>
         from (
         SELECT a.*, b.name AS warehouseName, c.shelves_name AS shelvesName
-        FROM zuihou_base_0000.imcs_wms_instock a
-        LEFT JOIN zuihou_base_0000.imcs_wms_warehouse b ON a.warehouse_id = b.id
-        LEFT JOIN zuihou_base_0000.imcs_wms_shelves c ON a.wms_shelves_id = c.id
+        FROM zuihou_base_yj_0000.imcs_wms_instock a
+        LEFT JOIN zuihou_base_yj_0000.imcs_wms_warehouse b ON a.warehouse_id = b.id
+        LEFT JOIN zuihou_base_yj_0000.imcs_wms_shelves c ON a.wms_shelves_id = c.id
         )s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-wms-biz/src/main/resources/mapper_wms/base/WmsStockInfoMapper.xml

@@ -46,9 +46,9 @@
         <include refid="Base_Column_List"></include>
         from (
         SELECT a.*, b.name AS warehouseName, c.shelves_name AS shelvesName
-        FROM zuihou_base_0000.imcs_wms_stock_info a
-        LEFT JOIN zuihou_base_0000.imcs_wms_warehouse b ON a.warehouse_id = b.id
-        LEFT JOIN zuihou_base_0000.imcs_wms_shelves c ON a.wms_shelves_id = c.id
+        FROM zuihou_base_yj_0000.imcs_wms_stock_info a
+        LEFT JOIN zuihou_base_yj_0000.imcs_wms_warehouse b ON a.warehouse_id = b.id
+        LEFT JOIN zuihou_base_yj_0000.imcs_wms_shelves c ON a.wms_shelves_id = c.id
         )s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/sql.sql

@@ -71,10 +71,10 @@ CREATE TABLE `imcs_tenant_repair`  (
 ----------------------end-----------------------------------------
 
 --------------------start----------------------------
-ALTER TABLE `zuihou_base_0000`.`imcs_tenant_repair`
+ALTER TABLE `zuihou_base_yj_0000`.`imcs_tenant_repair`
 DROP COLUMN `productionline_id`;
 
-ALTER TABLE `zuihou_base_0000`.`imcs_tenant_repair`
+ALTER TABLE `zuihou_base_yj_0000`.`imcs_tenant_repair`
 DROP COLUMN `repair_status`;
 --------------------end----------------------------
 

imcs-admin-boot/仓储管理.sql

@@ -5,7 +5,7 @@
  Source Server Type    : MySQL
  Source Server Version : 50520
  Source Host           : 117.78.49.203:3306
- Source Schema         : zuihou_base_0000
+ Source Schema         : zuihou_base_yj_0000
 
  Target Server Type    : MySQL
  Target Server Version : 50520