合并update insert抽取逻辑

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/ContractedProductChangeHandler.java

@@ -31,29 +31,22 @@ public class ContractedProductChangeHandler extends AbstractCanalDbHandler {
             List<CanalEntry.Column> columns = rowData.getBeforeColumnsList();
 
             String valId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
                 }
             }
             LambdaQueryWrapper<ContractedProductChange> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(ContractedProductChange::getId, valId).eq(ContractedProductChange::getDbSourceId, valSource);
             contractedProductChangeService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            ContractedProductChange contractedProductChange = JSON.parseObject(jsonStr, ContractedProductChange.class);
-            contractedProductChange.setDbSourceId(valSource);
-
-            contractedProductChangeService.save(contractedProductChange);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
                     break;
                 }
@@ -65,9 +58,9 @@ public class ContractedProductChangeHandler extends AbstractCanalDbHandler {
             ContractedProductChange contractedProductChange = JSON.parseObject(jsonStr, ContractedProductChange.class);
             contractedProductChange.setDbSourceId(valSource);
 
-            if(!contractedProductChangeService.exists(queryWrapper)){
+            if (!contractedProductChangeService.exists(queryWrapper)) {
                 contractedProductChangeService.save(contractedProductChange);
-            }else {
+            } else {
                 contractedProductChangeService.update(contractedProductChange, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysDeptHandler.java

@@ -35,62 +35,41 @@ public class SysDeptHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("dept_id")) {
                     valId = column.getValue();
 
-                    if(ignoreDeptId(dataSourceEnum, valId, column)){
+                    if (ignoreDeptId(dataSourceEnum, valId, column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<CsoSysDept> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsoSysDept::getDeptId, valId).eq(CsoSysDept::getDbSourceId, valSource);
             csoSysDeptService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            CsoSysDept csoSysDept = JSON.parseObject(jsonStr, CsoSysDept.class);
-            csoSysDept.setDbSourceId(valSource);
-
-            csoSysDeptService.save(csoSysDept);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("dept_id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("dept_id")) {
                     valId = column.getValue();
 
-                    if(ignoreDeptId(dataSourceEnum, valId, column)){
+                    if (ignoreDeptId(dataSourceEnum, valId, column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -101,9 +80,9 @@ public class SysDeptHandler extends AbstractCanalDbHandler {
             CsoSysDept csoSysDept = JSON.parseObject(jsonStr, CsoSysDept.class);
             csoSysDept.setDbSourceId(valSource);
 
-            if(!csoSysDeptService.exists(queryWrapper)){
+            if (!csoSysDeptService.exists(queryWrapper)) {
                 csoSysDeptService.save(csoSysDept);
-            }else {
+            } else {
                 csoSysDeptService.update(csoSysDept, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysDeptRelationHandler.java

@@ -33,23 +33,23 @@ public class SysDeptRelationHandler extends AbstractCanalDbHandler {
             String ancestor = "";
             String descendant = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("ancestor")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("ancestor")) {
                     ancestor = column.getValue();
 
-                    if(ignoreDeptId(dataSourceEnum, ancestor, column)){
+                    if (ignoreDeptId(dataSourceEnum, ancestor, column)) {
                         ignoreDeptId = true;
                     }
-                }else if(column.getName().equals("descendant")){
+                } else if (column.getName().equals("descendant")) {
                     descendant = column.getValue();
 
-                    if(ignoreDeptId(dataSourceEnum, descendant, column)){
+                    if (ignoreDeptId(dataSourceEnum, descendant, column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -58,61 +58,31 @@ public class SysDeptRelationHandler extends AbstractCanalDbHandler {
                     .eq(SysDeptRelation::getDescendant, descendant)
                     .eq(SysDeptRelation::getDbSourceId, valSource);
             sysDeptRelationService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            String ancestor = "";
-            String descendant = "";
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("ancestor")){
-                    ancestor = column.getValue();
-
-                    if(ignoreDeptId(dataSourceEnum, ancestor, column)){
-                        ignoreDeptId = true;
-                    }
-                }else if(column.getName().equals("descendant")){
-                    descendant = column.getValue();
-
-                    if(ignoreDeptId(dataSourceEnum, descendant, column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            SysDeptRelation sysDeptRelation = JSON.parseObject(jsonStr, SysDeptRelation.class);
-            sysDeptRelation.setDbSourceId(valSource);
-
-            sysDeptRelationService.save(sysDeptRelation);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String ancestor = "";
             String descendant = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("ancestor")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("ancestor")) {
                     ancestor = column.getValue();
 
-                    if(ignoreDeptId(dataSourceEnum, ancestor, column)){
+                    if (ignoreDeptId(dataSourceEnum, ancestor, column)) {
                         ignoreDeptId = true;
                     }
-                }else if(column.getName().equals("descendant")){
+                } else if (column.getName().equals("descendant")) {
                     descendant = column.getValue();
 
-                    if(ignoreDeptId(dataSourceEnum, descendant, column)){
+                    if (ignoreDeptId(dataSourceEnum, descendant, column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -124,9 +94,9 @@ public class SysDeptRelationHandler extends AbstractCanalDbHandler {
             SysDeptRelation sysDeptRelation = JSON.parseObject(jsonStr, SysDeptRelation.class);
             sysDeptRelation.setDbSourceId(valSource);
 
-            if(!sysDeptRelationService.exists(queryWrapper)){
+            if (!sysDeptRelationService.exists(queryWrapper)) {
                 sysDeptRelationService.save(sysDeptRelation);
-            }else {
+            } else {
                 sysDeptRelationService.update(sysDeptRelation, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysDeptSubHandler.java

@@ -31,64 +31,43 @@ public class SysDeptSubHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("sub_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("sub_id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<SysDeptSub> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(SysDeptSub::getSubId, valId).eq(SysDeptSub::getDbSourceId, valSource);
             sysDeptSubService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            SysDeptSub sysDeptSub = JSON.parseObject(jsonStr, SysDeptSub.class);
-            sysDeptSub.setDbSourceId(valSource);
-
-            sysDeptSubService.save(sysDeptSub);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(columns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("sub_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("sub_id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -99,9 +78,9 @@ public class SysDeptSubHandler extends AbstractCanalDbHandler {
             SysDeptSub sysDeptSub = JSON.parseObject(jsonStr, SysDeptSub.class);
             sysDeptSub.setDbSourceId(valSource);
 
-            if(!sysDeptSubService.exists(queryWrapper)){
+            if (!sysDeptSubService.exists(queryWrapper)) {
                 sysDeptSubService.save(sysDeptSub);
-            }else {
+            } else {
                 sysDeptSubService.update(sysDeptSub, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysDictItemHandler.java

@@ -39,15 +39,8 @@ public class SysDictItemHandler extends AbstractCanalDbHandler {
             LambdaQueryWrapper<CsoSysDictItem> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsoSysDictItem::getId, valId).eq(CsoSysDictItem::getDbSourceId, valSource);
             csoSysDictItemService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            CsoSysDictItem csoSysDictItem = JSON.parseObject(jsonStr, CsoSysDictItem.class);
-            csoSysDictItem.setDbSourceId(valSource);
-
-            csoSysDictItemService.save(csoSysDictItem);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+        ||eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysFinancialGmvSettleDataHandler.java

@@ -18,7 +18,7 @@ public class SysFinancialGmvSettleDataHandler extends AbstractCanalDbHandler {
 
     @Autowired
     private SysFinancialGmvSettleDataService sysFinancialGmvSettleDataService;
-    
+
     public String tableName() {
         return TABLE_NAME;
     }
@@ -31,29 +31,22 @@ public class SysFinancialGmvSettleDataHandler extends AbstractCanalDbHandler {
             List<CanalEntry.Column> columns = rowData.getBeforeColumnsList();
 
             String valId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
                 }
             }
             LambdaQueryWrapper<SysFinancialGmvSettleData> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(SysFinancialGmvSettleData::getId, valId).eq(SysFinancialGmvSettleData::getDbSourceId, valSource);
             sysFinancialGmvSettleDataService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            SysFinancialGmvSettleData sysFinancialGmvSettleData = JSON.parseObject(jsonStr, SysFinancialGmvSettleData.class);
-            sysFinancialGmvSettleData.setDbSourceId(valSource);
-
-            sysFinancialGmvSettleDataService.save(sysFinancialGmvSettleData);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
                     break;
                 }
@@ -65,9 +58,9 @@ public class SysFinancialGmvSettleDataHandler extends AbstractCanalDbHandler {
             SysFinancialGmvSettleData sysFinancialGmvSettleData = JSON.parseObject(jsonStr, SysFinancialGmvSettleData.class);
             sysFinancialGmvSettleData.setDbSourceId(valSource);
 
-            if(!sysFinancialGmvSettleDataService.exists(queryWrapper)){
+            if (!sysFinancialGmvSettleDataService.exists(queryWrapper)) {
                 sysFinancialGmvSettleDataService.save(sysFinancialGmvSettleData);
-            }else {
+            } else {
                 sysFinancialGmvSettleDataService.update(sysFinancialGmvSettleData, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysImplPlanHandler.java

@@ -32,67 +32,45 @@ public class SysImplPlanHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("plan_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("plan_id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("consignor_id")
-                        ||column.getName().equals("consignee_id")){
+                } else if (column.getName().equals("consignor_id")
+                        || column.getName().equals("consignee_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<SysImplPlan> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(SysImplPlan::getPlanId, valId).eq(SysImplPlan::getDbSourceId, valSource);
             sysImplPlanService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("consignor_id")
-                        ||column.getName().equals("consignee_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            SysImplPlan sysImplPlan = JSON.parseObject(jsonStr, SysImplPlan.class);
-            sysImplPlan.setDbSourceId(valSource);
-
-            sysImplPlanService.save(sysImplPlan);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("plan_id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("plan_id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("consignor_id")
-                        ||column.getName().equals("consignee_id")){
+                } else if (column.getName().equals("consignor_id")
+                        || column.getName().equals("consignee_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -103,9 +81,9 @@ public class SysImplPlanHandler extends AbstractCanalDbHandler {
             SysImplPlan sysImplPlan = JSON.parseObject(jsonStr, SysImplPlan.class);
             sysImplPlan.setDbSourceId(valSource);
 
-            if(!sysImplPlanService.exists(queryWrapper)){
+            if (!sysImplPlanService.exists(queryWrapper)) {
                 sysImplPlanService.save(sysImplPlan);
-            }else {
+            } else {
                 sysImplPlanService.update(sysImplPlan, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysRoleHandler.java

@@ -31,29 +31,22 @@ public class SysRoleHandler extends AbstractCanalDbHandler {
             List<CanalEntry.Column> columns = rowData.getBeforeColumnsList();
 
             String valId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("role_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("role_id")) {
                     valId = column.getValue();
                 }
             }
             LambdaQueryWrapper<CsoSysRole> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsoSysRole::getRoleId, valId).eq(CsoSysRole::getDbSourceId, valSource);
             csoSysRoleService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            CsoSysRole csoSysRole = JSON.parseObject(jsonStr, CsoSysRole.class);
-            csoSysRole.setDbSourceId(valSource);
-
-            csoSysRoleService.save(csoSysRole);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("role_id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("role_id")) {
                     valId = column.getValue();
                     break;
                 }
@@ -65,9 +58,9 @@ public class SysRoleHandler extends AbstractCanalDbHandler {
             CsoSysRole csoSysRole = JSON.parseObject(jsonStr, CsoSysRole.class);
             csoSysRole.setDbSourceId(valSource);
 
-            if(!csoSysRoleService.exists(queryWrapper)){
+            if (!csoSysRoleService.exists(queryWrapper)) {
                 csoSysRoleService.save(csoSysRole);
-            }else {
+            } else {
                 csoSysRoleService.update(csoSysRole, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysUserHandler.java

@@ -32,67 +32,45 @@ public class SysUserHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("user_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("user_id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")
-                        ||column.getName().equals("drugEnt_id")){
+                } else if (column.getName().equals("dept_id")
+                        || column.getName().equals("drugEnt_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<CsoSysUser> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CsoSysUser::getUserId, valId).eq(CsoSysUser::getDbSourceId, valSource);
             csoSysUserService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")
-                        ||column.getName().equals("drugEnt_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            CsoSysUser csoSysUser = JSON.parseObject(jsonStr, CsoSysUser.class);
-            csoSysUser.setDbSourceId(valSource);
-
-            csoSysUserService.save(csoSysUser);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("user_id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("user_id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")
-                        ||column.getName().equals("drugEnt_id")){
+                } else if (column.getName().equals("dept_id")
+                        || column.getName().equals("drugEnt_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -103,9 +81,9 @@ public class SysUserHandler extends AbstractCanalDbHandler {
             CsoSysUser csoSysUser = JSON.parseObject(jsonStr, CsoSysUser.class);
             csoSysUser.setDbSourceId(valSource);
 
-            if(!csoSysUserService.exists(queryWrapper)){
+            if (!csoSysUserService.exists(queryWrapper)) {
                 csoSysUserService.save(csoSysUser);
-            }else {
+            } else {
                 csoSysUserService.update(csoSysUser, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysUserRoleHandler.java

@@ -31,10 +31,10 @@ public class SysUserRoleHandler extends AbstractCanalDbHandler {
 
             String userId = "";
             String roleId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("user_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("user_id")) {
                     userId = column.getValue();
-                }else if(column.getName().equals("role_id")){
+                } else if (column.getName().equals("role_id")) {
                     roleId = column.getValue();
                 }
             }
@@ -43,24 +43,17 @@ public class SysUserRoleHandler extends AbstractCanalDbHandler {
                     .eq(CsoSysUserRole::getRoleId, roleId)
                     .eq(CsoSysUserRole::getDbSourceId, valSource);
             sysUserRoleService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            CsoSysUserRole sysUserRole = JSON.parseObject(jsonStr, CsoSysUserRole.class);
-            sysUserRole.setDbSourceId(valSource);
-
-            sysUserRoleService.save(sysUserRole);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(columns);
 
             String userId = "";
             String roleId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("user_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("user_id")) {
                     userId = column.getValue();
-                }else if(column.getName().equals("role_id")){
+                } else if (column.getName().equals("role_id")) {
                     roleId = column.getValue();
                 }
             }
@@ -73,9 +66,9 @@ public class SysUserRoleHandler extends AbstractCanalDbHandler {
             CsoSysUserRole sysUserRole = JSON.parseObject(jsonStr, CsoSysUserRole.class);
             sysUserRole.setDbSourceId(valSource);
 
-            if(!sysUserRoleService.exists(queryWrapper)){
+            if (!sysUserRoleService.exists(queryWrapper)) {
                 sysUserRoleService.save(sysUserRole);
-            }else {
+            } else {
                 sysUserRoleService.update(sysUserRole, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/SysUserSubHandler.java

@@ -32,64 +32,43 @@ public class SysUserSubHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
                     Integer deptId = Integer.valueOf(column.getValue());
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<SysUserSub> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(SysUserSub::getId, valId).eq(SysUserSub::getDbSourceId, valSource);
             sysUserSubService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            SysUserSub sysUserSub = JSON.parseObject(jsonStr, SysUserSub.class);
-            sysUserSub.setDbSourceId(valSource);
-
-            sysUserSubService.save(sysUserSub);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(columns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                } else if (column.getName().equals("dept_id")) {
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -100,9 +79,9 @@ public class SysUserSubHandler extends AbstractCanalDbHandler {
             SysUserSub sysUserSub = JSON.parseObject(jsonStr, SysUserSub.class);
             sysUserSub.setDbSourceId(valSource);
 
-            if(!sysUserSubService.exists(queryWrapper)){
+            if (!sysUserSubService.exists(queryWrapper)) {
                 sysUserSubService.save(sysUserSub);
-            }else {
+            } else {
                 sysUserSubService.update(sysUserSub, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmDaAgentHandler.java

@@ -31,64 +31,43 @@ public class WmDaAgentHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("drug_ent_id")
-                        ||column.getName().equals("dept_id")){
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                } else if (column.getName().equals("drug_ent_id")
+                        || column.getName().equals("dept_id")) {
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmDaAgent> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmDaAgent::getId, valId).eq(WmDaAgent::getDbSourceId, valSource);
             wmDaAgentService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("drug_ent_id")
-                        ||column.getName().equals("dept_id")){
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmDaAgent wmDaAgent = JSON.parseObject(jsonStr, WmDaAgent.class);
-            wmDaAgent.setDbSourceId(valSource);
-
-            wmDaAgentService.save(wmDaAgent);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(columns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("drug_ent_id")
-                        ||column.getName().equals("dept_id")){
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                } else if (column.getName().equals("drug_ent_id")
+                        || column.getName().equals("dept_id")) {
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -99,9 +78,9 @@ public class WmDaAgentHandler extends AbstractCanalDbHandler {
             WmDaAgent wmDaAgent = JSON.parseObject(jsonStr, WmDaAgent.class);
             wmDaAgent.setDbSourceId(valSource);
 
-            if(!wmDaAgentService.exists(queryWrapper)){
+            if (!wmDaAgentService.exists(queryWrapper)) {
                 wmDaAgentService.save(wmDaAgent);
-            }else {
+            } else {
                 wmDaAgentService.update(wmDaAgent, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmDaDrugEntDrugtableHandler.java

@@ -32,63 +32,42 @@ public class WmDaDrugEntDrugtableHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("drug_ent_id")){
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                } else if (column.getName().equals("drug_ent_id")) {
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmDaDrugEntDrugtable> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmDaDrugEntDrugtable::getId, valId).eq(WmDaDrugEntDrugtable::getDbSourceId, valSource);
             wmDaDrugEntDrugtableService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("drug_ent_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmDaDrugEntDrugtable wmDaDrugEntDrugtable = JSON.parseObject(jsonStr, WmDaDrugEntDrugtable.class);
-            wmDaDrugEntDrugtable.setDbSourceId(valSource);
-
-            wmDaDrugEntDrugtableService.save(wmDaDrugEntDrugtable);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("drug_ent_id")){
+                } else if (column.getName().equals("drug_ent_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -99,9 +78,9 @@ public class WmDaDrugEntDrugtableHandler extends AbstractCanalDbHandler {
             WmDaDrugEntDrugtable wmDaDrugEntDrugtable = JSON.parseObject(jsonStr, WmDaDrugEntDrugtable.class);
             wmDaDrugEntDrugtable.setDbSourceId(valSource);
 
-            if(!wmDaDrugEntDrugtableService.exists(queryWrapper)){
+            if (!wmDaDrugEntDrugtableService.exists(queryWrapper)) {
                 wmDaDrugEntDrugtableService.save(wmDaDrugEntDrugtable);
-            }else {
+            } else {
                 wmDaDrugEntDrugtableService.update(wmDaDrugEntDrugtable, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmDaDrugEntHandler.java

@@ -32,64 +32,43 @@ public class WmDaDrugEntHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmDaDrugEnt> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmDaDrugEnt::getId, valId).eq(WmDaDrugEnt::getDbSourceId, valSource);
             wmDaDrugEntService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmDaDrugEnt wmDaDrugEnt = JSON.parseObject(jsonStr, WmDaDrugEnt.class);
-            wmDaDrugEnt.setDbSourceId(valSource);
-
-            wmDaDrugEntService.save(wmDaDrugEnt);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(columns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -100,9 +79,9 @@ public class WmDaDrugEntHandler extends AbstractCanalDbHandler {
             WmDaDrugEnt wmDaDrugEnt = JSON.parseObject(jsonStr, WmDaDrugEnt.class);
             wmDaDrugEnt.setDbSourceId(valSource);
 
-            if(!wmDaDrugEntService.exists(queryWrapper)){
+            if (!wmDaDrugEntService.exists(queryWrapper)) {
                 wmDaDrugEntService.save(wmDaDrugEnt);
-            }else {
+            } else {
                 wmDaDrugEntService.update(wmDaDrugEnt, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmScorePackageHandler.java

@@ -31,67 +31,45 @@ public class WmScorePackageHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("send_package_dept_id")
-                        ||column.getName().equals("dept_id")){
+                } else if (column.getName().equals("send_package_dept_id")
+                        || column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmScorePackage> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmScorePackage::getId, valId).eq(WmScorePackage::getDbSourceId, valSource);
             wmScorePackageService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("send_package_dept_id")
-                        ||column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmScorePackage wmScorePackage = JSON.parseObject(jsonStr, WmScorePackage.class);
-            wmScorePackage.setDbSourceId(valSource);
-
-            wmScorePackageService.save(wmScorePackage);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("send_package_dept_id")
-                        ||column.getName().equals("dept_id")){
+                } else if (column.getName().equals("send_package_dept_id")
+                        || column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -102,9 +80,9 @@ public class WmScorePackageHandler extends AbstractCanalDbHandler {
             WmScorePackage wmScorePackage = JSON.parseObject(jsonStr, WmScorePackage.class);
             wmScorePackage.setDbSourceId(valSource);
 
-            if(!wmScorePackageService.exists(queryWrapper)){
+            if (!wmScorePackageService.exists(queryWrapper)) {
                 wmScorePackageService.save(wmScorePackage);
-            }else {
+            } else {
                 wmScorePackageService.update(wmScorePackage, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmScorePackageSettleNoteHandler.java

@@ -30,29 +30,22 @@ public class WmScorePackageSettleNoteHandler extends AbstractCanalDbHandler {
             List<CanalEntry.Column> columns = rowData.getBeforeColumnsList();
 
             String valId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
                 }
             }
             LambdaQueryWrapper<WmScorePackageSettleNote> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmScorePackageSettleNote::getId, valId).eq(WmScorePackageSettleNote::getDbSourceId, valSource);
             wmScorePackageSettleNoteService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            WmScorePackageSettleNote wmScorePackageSettleNote = JSON.parseObject(jsonStr, WmScorePackageSettleNote.class);
-            wmScorePackageSettleNote.setDbSourceId(valSource);
-
-            wmScorePackageSettleNoteService.save(wmScorePackageSettleNote);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
                     break;
                 }
@@ -64,9 +57,9 @@ public class WmScorePackageSettleNoteHandler extends AbstractCanalDbHandler {
             WmScorePackageSettleNote wmScorePackageSettleNote = JSON.parseObject(jsonStr, WmScorePackageSettleNote.class);
             wmScorePackageSettleNote.setDbSourceId(valSource);
 
-            if(!wmScorePackageSettleNoteService.exists(queryWrapper)){
+            if (!wmScorePackageSettleNoteService.exists(queryWrapper)) {
                 wmScorePackageSettleNoteService.save(wmScorePackageSettleNote);
-            }else {
+            } else {
                 wmScorePackageSettleNoteService.update(wmScorePackageSettleNote, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmScorePackageStatusHandler.java

@@ -17,7 +17,7 @@ public class WmScorePackageStatusHandler extends AbstractCanalDbHandler {
 
     @Autowired
     private WmScorePackageStatusService wmScorePackageStatusService;
-    
+
     public String tableName() {
         return TABLE_NAME;
     }
@@ -31,64 +31,43 @@ public class WmScorePackageStatusHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmScorePackageStatus> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmScorePackageStatus::getId, valId).eq(WmScorePackageStatus::getDbSourceId, valSource);
             wmScorePackageStatusService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmScorePackageStatus contractedProductChange = JSON.parseObject(jsonStr, WmScorePackageStatus.class);
-            contractedProductChange.setDbSourceId(valSource);
-
-            wmScorePackageStatusService.save(contractedProductChange);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(columns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("dept_id")){
+                } else if (column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -99,9 +78,9 @@ public class WmScorePackageStatusHandler extends AbstractCanalDbHandler {
             WmScorePackageStatus contractedProductChange = JSON.parseObject(jsonStr, WmScorePackageStatus.class);
             contractedProductChange.setDbSourceId(valSource);
 
-            if(!wmScorePackageStatusService.exists(queryWrapper)){
+            if (!wmScorePackageStatusService.exists(queryWrapper)) {
                 wmScorePackageStatusService.save(contractedProductChange);
-            }else {
+            } else {
                 wmScorePackageStatusService.update(contractedProductChange, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmTaskHandler.java

@@ -33,67 +33,46 @@ public class WmTaskHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("drug_ent_id")
-                        ||column.getName().equals("dept_id")){
+                } else if (column.getName().equals("drug_ent_id")
+                        || column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmTask> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmTask::getId, valId).eq(WmTask::getDbSourceId, valSource);
             wmTaskService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("drug_ent_id")
-                        ||column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmTask wmTask = JSON.parseObject(jsonStr, WmTask.class);
-            wmTask.setDbSourceId(valSource);
-
-            wmTaskService.save(wmTask);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT
+        ) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("drug_ent_id")
-                        ||column.getName().equals("dept_id")){
+                } else if (column.getName().equals("drug_ent_id")
+                        || column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -104,9 +83,9 @@ public class WmTaskHandler extends AbstractCanalDbHandler {
             WmTask wmTask = JSON.parseObject(jsonStr, WmTask.class);
             wmTask.setDbSourceId(valSource);
 
-            if(!wmTaskService.exists(queryWrapper)){
+            if (!wmTaskService.exists(queryWrapper)) {
                 wmTaskService.save(wmTask);
-            }else {
+            } else {
                 wmTaskService.update(wmTask, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmTaskTypeHandler.java

@@ -31,73 +31,49 @@ public class WmTaskTypeHandler extends AbstractCanalDbHandler {
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("durgent_id")
-                        ||column.getName().equals("level1_id")
-                        ||column.getName().equals("task_ent_id")
-                        ||column.getName().equals("dept_id")){
+                } else if (column.getName().equals("durgent_id")
+                        || column.getName().equals("level1_id")
+                        || column.getName().equals("task_ent_id")
+                        || column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
             LambdaQueryWrapper<WmTaskType> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmTaskType::getId, valId).eq(WmTaskType::getDbSourceId, valSource);
             wmTaskTypeService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("durgent_id")
-                        ||column.getName().equals("level1_id")
-                        ||column.getName().equals("task_ent_id")
-                        ||column.getName().equals("dept_id")){
-
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
-                        ignoreDeptId = true;
-                    }
-                }
-            }
-
-            if(ignoreDeptId){
-                return;
-            }
-
-            WmTaskType wmTaskType = JSON.parseObject(jsonStr, WmTaskType.class);
-            wmTaskType.setDbSourceId(valSource);
-
-            wmTaskTypeService.save(wmTaskType);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
             boolean ignoreDeptId = false;
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("id")) {
                     valId = column.getValue();
-                }else if(column.getName().equals("durgent_id")
-                        ||column.getName().equals("level1_id")
-                        ||column.getName().equals("task_ent_id")
-                        ||column.getName().equals("dept_id")){
+                } else if (column.getName().equals("durgent_id")
+                        || column.getName().equals("level1_id")
+                        || column.getName().equals("task_ent_id")
+                        || column.getName().equals("dept_id")) {
 
-                    if(ignoreDeptId(dataSourceEnum, column.getValue(), column)){
+                    if (ignoreDeptId(dataSourceEnum, column.getValue(), column)) {
                         ignoreDeptId = true;
                     }
                 }
             }
 
-            if(ignoreDeptId){
+            if (ignoreDeptId) {
                 return;
             }
 
@@ -108,9 +84,9 @@ public class WmTaskTypeHandler extends AbstractCanalDbHandler {
             WmTaskType wmTaskType = JSON.parseObject(jsonStr, WmTaskType.class);
             wmTaskType.setDbSourceId(valSource);
 
-            if(!wmTaskTypeService.exists(queryWrapper)){
+            if (!wmTaskTypeService.exists(queryWrapper)) {
                 wmTaskTypeService.save(wmTaskType);
-            }else {
+            } else {
                 wmTaskTypeService.update(wmTaskType, queryWrapper);
             }
         }

yaoyi-bi/src/main/java/com/retdata/yaoyibi/canal/handler/WmUserPlatQuizResHandler.java

@@ -31,29 +31,22 @@ public class WmUserPlatQuizResHandler extends AbstractCanalDbHandler {
             List<CanalEntry.Column> columns = rowData.getBeforeColumnsList();
 
             String valId = "";
-            for(CanalEntry.Column column : columns){
-                if(column.getName().equals("res_id")){
+            for (CanalEntry.Column column : columns) {
+                if (column.getName().equals("res_id")) {
                     valId = column.getValue();
                 }
             }
             LambdaQueryWrapper<WmUserPlatQuizRes> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(WmUserPlatQuizRes::getResultId, valId).eq(WmUserPlatQuizRes::getDbSourceId, valSource);
             wmUserPlatQuizResService.delete(queryWrapper);
-        } else if (eventType == CanalEntry.EventType.INSERT) {
-            List<CanalEntry.Column> columns = rowData.getAfterColumnsList();
-            String jsonStr = columnsToJson(columns);
-
-            WmUserPlatQuizRes wmUserPlatQuizRes = JSON.parseObject(jsonStr, WmUserPlatQuizRes.class);
-            wmUserPlatQuizRes.setDbSourceId(valSource);
-
-            wmUserPlatQuizResService.save(wmUserPlatQuizRes);
-        } else if (eventType == CanalEntry.EventType.UPDATE) {
+        } else if (eventType == CanalEntry.EventType.UPDATE
+                || eventType == CanalEntry.EventType.INSERT) {
             List<CanalEntry.Column> afterColumns = rowData.getAfterColumnsList();
             String jsonStr = columnsToJson(afterColumns);
 
             String valId = "";
-            for(CanalEntry.Column column : afterColumns){
-                if(column.getName().equals("res_id")){
+            for (CanalEntry.Column column : afterColumns) {
+                if (column.getName().equals("res_id")) {
                     valId = column.getValue();
                     break;
                 }
@@ -65,9 +58,9 @@ public class WmUserPlatQuizResHandler extends AbstractCanalDbHandler {
             WmUserPlatQuizRes wmUserPlatQuizRes = JSON.parseObject(jsonStr, WmUserPlatQuizRes.class);
             wmUserPlatQuizRes.setDbSourceId(valSource);
 
-            if(!wmUserPlatQuizResService.exists(queryWrapper)){
+            if (!wmUserPlatQuizResService.exists(queryWrapper)) {
                 wmUserPlatQuizResService.save(wmUserPlatQuizRes);
-            }else {
+            } else {
                 wmUserPlatQuizResService.update(wmUserPlatQuizRes, queryWrapper);
             }
         }