merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

 src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java

@@ -86,6 +86,13 @@
    ISysMenuService menuService;
    @Autowired
    IMasterAuthorSubscribeService subscribeService;
    /**
     *
     * @description:  通过汇集id执行汇集任务
     * @param id 汇集id
     * @return: 执行结果
     *
     */
    @Override
    public Result run(String id) {
        XxlJobLogger.log("log info: run" );
@@ -128,15 +135,6 @@

                }
            }
        }

        String tableNameByMenu = menuMappingService.getTableNameByMenu(assemble.getMenuId());
        boolean canAct = maintainService.getCanAct(tableNameByMenu);
        if (!canAct) {
            XxlJobLogger.log("当前有流程正在运行,暂时无法汇集下次数据");
            assemble.setPreMsg("当前有流程正在运行,暂时无法汇集下次数据");
            assemble.updateById();
            return  Result.error(new CodeMsg(6009,"当前有流程正在运行,暂时无法汇集下次数据"));
        }

        Boolean bigData = assemble.getBigdata();
@@ -601,6 +599,8 @@

    private Result checkTempData(SysAssemble assemble) {
        try {


            SysAssembleCheckType checkType = assemble.getCheckType();
            if (checkType == null) {
                return Result.error(new CodeMsg(6009, "规则校验类型为空"));
@@ -636,6 +636,7 @@

            return Result.success(null);
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error(new CodeMsg(3009, e.getMessage()));
        }
    }