diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index e67f916..4530011 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -57,7 +57,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O addDept("儿科", obj); addDept("妇产科", obj); // 新建机构时,新建6个角色:院内统计87、产科产房4、儿科医生46、院办管理63、孕产妇医生48、主任-产科66 - addDefaultRoles(obj); +// addDefaultRoles(obj); return obj.getId(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java index 7d03149..b781294 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java @@ -34,6 +34,32 @@ import org.apache.ibatis.type.TypeHandlerRegistry; }) public class MybatisSqlInterceptor implements Interceptor { + //同步的表 + private static Set uses = new HashSet<>(); + //不同步的表 + private static Set noUses = new HashSet<>(); + static { + uses.add("departments"); + uses.add("organization"); + uses.add("permissions"); + uses.add("permissions2"); + uses.add("regions"); + uses.add("role_permission_maps"); + uses.add("roles"); + uses.add("user_organization_maps"); + uses.add("user_role_maps"); + uses.add("users"); + + noUses.add("coupon_info"); + noUses.add("coupon_template"); + noUses.add("coupon_template_group"); + noUses.add("coupon_type"); + noUses.add("hospital_coupon_template_group"); + noUses.add("lis_report_tbl"); + noUses.add("ris_report_tbl"); + + } + private String sql; private Properties properties; @@ -71,7 +97,7 @@ public class MybatisSqlInterceptor implements Interceptor { { sql = getSql(configuration, boundSql, sqlId); System.out.println("sql = "+sql); - if (!(sql.toUpperCase().contains("LIS_REPORT_TBL") || sql.toUpperCase().contains("RIS_REPORT_TBL"))) + if (isSyncTable(sql)) { System.out.println("delete or update sync sql = " + sql); @@ -85,7 +111,7 @@ public class MybatisSqlInterceptor implements Interceptor { { System.out.println("time5=========" + (System.currentTimeMillis()-start)); String tempSql = getSql(configuration, boundSql, sqlId); - if (!(tempSql.toUpperCase().contains("LIS_REPORT_TBL") || tempSql.toUpperCase().contains("RIS_REPORT_TBL"))) + if (isSyncTable(tempSql)) { sql = tempSql; System.out.println("sql = "+sql); @@ -125,6 +151,40 @@ public class MybatisSqlInterceptor implements Interceptor { return returnValue; } + + /** + * 判断sql中的表是否要同步的 + * @param sql + * @return + */ + private boolean isSyncTable(String sql) + { + boolean result = false; + boolean nouse = true; + if (StringUtils.isEmpty(sql)) + { + return result; + } + for(String key : uses) + { + if (sql.toLowerCase().contains(key)) + { + result = true; + break; + } + } + + for(String key : noUses) + { + if (sql.toLowerCase().contains(key)) + { + nouse = false; + break; + } + } + return nouse == result; + } + public static String getSql(Configuration configuration, BoundSql boundSql, String sqlId) { String sql = showSql(configuration, boundSql);