Merge remote-tracking branch 'origin/master'

 iailab-cloud/iailab-gateway/src/main/resources/application.yaml

@@ -148,7 +148,7 @@

logging:
  file:
    name: @log.path@/logs/${spring.application.name}.log # 日志文件名，全路径
    name: @log.path@/iailab-gateway/log/${spring.application.name}.log # 日志文件名，全路径

knife4j:
  # 聚合 Swagger 文档，参考 https://doc.xiaominfo.com/docs/action/springcloud-gateway 文档

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/BpmTaskController.java

@@ -4,6 +4,7 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.number.NumberUtils;
import com.iailab.framework.datapermission.core.annotation.DataPermission;
import com.iailab.module.bpm.controller.admin.task.vo.task.*;
import com.iailab.module.bpm.convert.task.BpmTaskConvert;
import com.iailab.module.bpm.dal.dataobject.definition.BpmFormDO;
@@ -60,6 +61,7 @@
    @GetMapping("todo-page")
    @Operation(summary = "获取 Todo 待办任务分页")
    @PreAuthorize("@ss.hasPermission('bpm:task:query')")
    @DataPermission(enable = false) // 关闭数据权限，避免只查看自己时，查询不到部门。
    public CommonResult<PageResult<BpmTaskRespVO>> getTaskTodoPage(@Valid BpmTaskPageReqVO pageVO) {
        PageResult<Task> pageResult = taskService.getTaskTodoPage(getLoginUserId(), pageVO);
        if (CollUtil.isEmpty(pageResult.getList())) {
@@ -69,9 +71,11 @@
        // 拼接数据
        Map<String, ProcessInstance> processInstanceMap = processInstanceService.getProcessInstanceMap(
                convertSet(pageResult.getList(), Task::getProcessInstanceId));
        // TODO 此处有bug
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(processInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId())));
        return success(BpmTaskConvert.INSTANCE.buildTodoTaskPage(pageResult, processInstanceMap, userMap));
        PageResult<BpmTaskRespVO> bpmTaskRespVOPageResult = BpmTaskConvert.INSTANCE.buildTodoTaskPage(pageResult, processInstanceMap, userMap);
        return success(bpmTaskRespVOPageResult);
    }

    @GetMapping("done-page")

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java

@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.iailab.framework.common.util.number.NumberUtils;
import com.iailab.framework.datapermission.core.annotation.DataPermission;
import com.iailab.module.bpm.enums.definition.BpmBoundaryEventType;
import com.iailab.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
import com.iailab.module.bpm.framework.flowable.core.util.BpmnModelUtils;

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/demo/exection/DemoDelegateClassExecutionListener.java

@@ -1,8 +1,12 @@
package com.iailab.module.bpm.framework.flowable.core.listener.demo.exection;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.flowable.bpmn.model.FieldExtension;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.JavaDelegate;

import java.util.List;

/**
 * 类型为 class 的 ExecutionListener 监听器示例
@@ -14,8 +18,15 @@

    @Override
    public void execute(DelegateExecution execution) {
        log.info("[execute][execution({}) 被调用！变量有：{}]", execution.getId(),
        log.info("[execute][execution({}) 执行监听器（类）被调用！变量有：{}]", execution.getId(),
                execution.getCurrentFlowableListener().getFieldExtensions());
        List<FieldExtension> fieldExtensions = execution.getCurrentFlowableListener().getFieldExtensions();
        if(ObjectUtils.isNotEmpty(fieldExtensions)) {
            fieldExtensions.stream().forEach(fieldExtension -> {
                System.out.println(fieldExtension.getFieldName());
                System.out.println(fieldExtension.getExpression());
            });
        }
    }

}

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/demo/exection/DemoDelegateExpressionExecutionListener.java

@@ -1,9 +1,13 @@
package com.iailab.module.bpm.framework.flowable.core.listener.demo.exection;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.flowable.bpmn.model.FieldExtension;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.JavaDelegate;
import org.springframework.stereotype.Component;

import java.util.List;

/**
 * 类型为 delegateExpression 的 ExecutionListener 监听器示例
@@ -16,8 +20,15 @@

    @Override
    public void execute(DelegateExecution execution) {
        log.info("[execute][execution({}) 被调用！变量有：{}]", execution.getId(),
        log.info("[execute][execution({}) 执行监听器（委托表达式被调用）！变量有：{}]", execution.getId(),
                execution.getCurrentFlowableListener().getFieldExtensions());
        List<FieldExtension> fieldExtensions = execution.getCurrentFlowableListener().getFieldExtensions();
        if(ObjectUtils.isNotEmpty(fieldExtensions)) {
            fieldExtensions.stream().forEach(fieldExtension -> {
                System.out.println(fieldExtension.getFieldName());
                System.out.println(fieldExtension.getStringValue());
            });
        }
    }

}

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/demo/exection/DemoSpringExpressionExecutionListener.java

@@ -1,8 +1,12 @@
package com.iailab.module.bpm.framework.flowable.core.listener.demo.exection;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.flowable.bpmn.model.FieldExtension;
import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.stereotype.Component;

import java.util.List;

/**
 * 类型为 expression 的 ExecutionListener 监听器示例
@@ -14,8 +18,15 @@
public class DemoSpringExpressionExecutionListener {

    public void execute(DelegateExecution execution) {
        log.info("[execute][execution({}) 被调用！变量有：{}]", execution.getId(),
        log.info("[execute][execution({}) 执行监听器（spring表达式）被调用！变量有：{}]", execution.getId(),
                execution.getCurrentFlowableListener().getFieldExtensions());
        List<FieldExtension> fieldExtensions = execution.getCurrentFlowableListener().getFieldExtensions();
        if(ObjectUtils.isNotEmpty(fieldExtensions)) {
            fieldExtensions.stream().forEach(fieldExtension -> {
                System.out.println(fieldExtension.getFieldName());
                System.out.println(fieldExtension.getExpression());
            });
        }
    }

}

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/demo/task/DemoDelegateClassTaskListener.java

@@ -14,7 +14,7 @@

    @Override
    public void notify(DelegateTask delegateTask) {
        log.info("[execute][task({}) 被调用]", delegateTask.getId());
        log.info("[execute][task({}) 任务监听器（类）被调用]", delegateTask.getId());
    }

}

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/demo/task/DemoDelegateExpressionTaskListener.java

@@ -5,6 +5,8 @@
import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.stereotype.Component;

import java.util.Map;

/**
 * 类型为 delegateExpression 的 TaskListener 监听器示例
 *
@@ -16,7 +18,9 @@

    @Override
    public void notify(DelegateTask delegateTask) {
        log.info("[execute][task({}) 被调用]", delegateTask.getId());
        log.info("[execute][task({}) 任务监听器（委托表达式）被调用]", delegateTask.getId());
        Map<String, Object> variables = delegateTask.getVariables();
        System.out.println(variables.toString());;
    }

}

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/listener/demo/task/DemoSpringExpressionTaskListener.java

@@ -14,7 +14,7 @@
public class DemoSpringExpressionTaskListener {

    public void notify(DelegateTask delegateTask) {
        log.info("[execute][task({}) 被调用]", delegateTask.getId());
        log.info("[execute][task({}) 任务监听器（spring表达式）被调用]", delegateTask.getId());
    }

}

 iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -9,6 +9,7 @@
import com.iailab.framework.common.util.number.NumberUtils;
import com.iailab.framework.common.util.object.ObjectUtils;
import com.iailab.framework.common.util.object.PageUtils;
import com.iailab.framework.datapermission.core.annotation.DataPermission;
import com.iailab.framework.web.core.util.WebFrameworkUtils;
import com.iailab.module.bpm.controller.admin.task.vo.task.*;
import com.iailab.module.bpm.convert.task.BpmTaskConvert;
@@ -1145,7 +1146,6 @@
                        }
                    }
                }

                AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(processInstance.getStartUserId())).getCheckedData();
                messageService.sendMessageWhenTaskAssigned(BpmTaskConvert.INSTANCE.convert(processInstance, startUser, task));
            }

 iailab-module-bpm/iailab-module-bpm-biz/src/test/java/com/iailab/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignLeaderExpressionTest.java

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/java/com/iailab/module/bpm/service/category/BpmCategoryServiceImplTest.java

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/java/com/iailab/module/bpm/service/definition/BpmFormServiceTest.java

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/java/com/iailab/module/bpm/service/definition/BpmUserGroupServiceTest.java

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/resources/application-unit-test.yaml

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/resources/logback.xml

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/resources/sql/clean.sql

文件已删除

 iailab-module-bpm/iailab-module-bpm-biz/src/test/resources/sql/create_tables.sql

文件已删除

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/plan/PlanItemApiImpl.java

@@ -70,6 +70,9 @@

    @Override
    public List<ApiPlanItemDTO> getInfoByIds(Set<String> planIds) {
        if (CollectionUtils.isEmpty(planIds)) {
            return new ArrayList<>();
        }
        List<PlanItemEntity> plans = planItemService.getInfoByIds(planIds);
        return ConvertUtils.sourceToTarget(plans,ApiPlanItemDTO.class);
    }

 iailab-module-data/iailab-module-data-biz/src/main/resources/application.yaml

@@ -61,7 +61,7 @@

logging:
  file:
    name: @log.path@/logs/${spring.application.name}.log # 日志文件名，全路径
    name: @log.path@/iailab-data/log/${spring.application.name}.log # 日志文件名，全路径
  level:
    org:
      springframework:

 iailab-module-infra/iailab-module-infra-biz/src/main/resources/application.yaml

@@ -11,7 +11,7 @@
      username: @nacos.username@
      password: @nacos.password@
      discovery: # 【配置中心】配置项
        ip: @deploy.server@
#        ip: @deploy.server@
        namespace: @profiles.active@
        group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
        metadata:
@@ -58,7 +58,7 @@

logging:
  file:
    name: D:/DLUT/IailabPlat/webapp/infra/logs/${spring.application.name}.log # 日志文件名，全路径
    name: @log.path@/iailab-infra/log/${spring.application.name}.log # 日志文件名，全路径

--- #################### 接口文档配置 ####################


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java

@@ -147,8 +147,8 @@
            ex.printStackTrace();
            throw ex;
        } catch (Exception ex) {
            log.error("调用发生异常，异常信息为:{1}", ex);
//            ex.printStackTrace();
//            log.error("调用发生异常，异常信息为:{0}", ex.getMessage());
            ex.printStackTrace();
            throw new ModelInvokeException(ex.getMessage());
        }
        return result;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleConstructor.java

@@ -32,6 +32,7 @@
            SampleDataConstructor sampleDataConstructor = sampleFactory.createSampelData(typeA);
            return sampleDataConstructor.prepareSampleData(sampleInfo);
        } catch (Exception e) {
            e.printStackTrace();
            throw new ModelInvokeException(MessageFormat.format("{0},Name:{1}",
                    ModelInvokeException.errorGetModelArithParam, itemName));
        }

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java

@@ -6,6 +6,7 @@
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.enums.DataPointFreqEnum;
import com.iailab.module.data.enums.TimeGranularitySecEnum;
import com.iailab.module.model.mcs.pre.enums.PredGranularityEnum;
import com.iailab.module.model.mdk.common.enums.ModelParamType;
import com.iailab.module.model.mdk.sample.dto.SampleData;
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
@@ -63,23 +64,9 @@
            case NORMALITEM:
            case MERGEITEM:
                // 预测值
                Calendar calendar = Calendar.getInstance();
                calendar.setTime(startTime);
                calendar.set(Calendar.HOUR_OF_DAY, 0);
                calendar.set(Calendar.MINUTE, 0);
                calendar.set(Calendar.SECOND, 0);
                calendar.add(Calendar.DAY_OF_YEAR, 1);
                startTime = calendar.getTime();
                start = startTime.getTime();

                calendar.setTime(endTime);
                calendar.set(Calendar.HOUR_OF_DAY, 0);
                calendar.set(Calendar.MINUTE, 0);
                calendar.set(Calendar.SECOND, 0);
                endTime = calendar.getTime();
                end = endTime.getTime();

                oneMin = 60 * 1000L;
                oneMin = PredGranularityEnum.MIN1.getCode() * 1000L;
                start = start - (start % oneMin) + oneMin;
                end = end - (end % oneMin) + oneMin;
                mins = ((end - start) / oneMin);
                break;
            case DATAPOINT:

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java

@@ -100,7 +100,7 @@
                break;
            case NORMALITEM:
            case MERGEITEM:
                dateTime = calendar.getTime();
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);
                break;
            case IND:
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);

 iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml

@@ -58,7 +58,7 @@

logging:
  file:
    name: @log.path@/logs/${spring.application.name}.log # 日志文件名，全路径
    name: @log.path@/iailab-model/log/${spring.application.name}.log # 日志文件名，全路径
  level:
    org:
      springframework:

 iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java

@@ -253,7 +253,7 @@
                    menu.setParentId(parentMenu.getId());
                    tempChildren.add(parentMenu);
                } else if(menu.getType().equals(MenuTypeEnum.DIR.getType())) {
                    // 为应用菜单二级目录前增加“/”
                    // 为应用菜单二级目录前增加“/” (不处理外链菜单path)
                    if(!menu.getPath().contains("http:") && !menu.getPath().contains("https:")) {
                        menu.setPath("/" + menu.getPath());
                    }

 iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/convert/auth/AuthConvert.java

@@ -208,7 +208,10 @@
        List<AuthPermissionInfoRespVO.MenuVO> menuVOS = filterList(treeNodeMap.values(), node -> id.equals(node.getParentId()));
        if(type == 0) {
            menuVOS.stream().forEach(menuVO -> {
                menuVO.setPath((parentPath + "/" + menuVO.getPath()).replace("//", "/"));
                // 不处理外链菜单path
                if(!menuVO.getPath().contains("http:") && !menuVO.getPath().contains("https:")) {
                    menuVO.setPath((parentPath + "/" + menuVO.getPath()).replace("//", "/"));
                }
            });
        }
        return menuVOS;

 iailab-module-system/iailab-module-system-biz/src/main/resources/application.yaml

@@ -58,7 +58,7 @@

logging:
  file:
    name: @log.path@/logs/${spring.application.name}.log # 日志文件名，全路径
    name: @log.path@/iailab-system/log/${spring.application.name}.log # 日志文件名，全路径

--- #################### 接口文档配置 ####################

@@ -225,4 +225,4 @@
    begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
    end-code: 9999 # 这里配置 9999 的原因是，测试方便。

debug: false
debug: true

 pom.xml

@@ -122,7 +122,7 @@
                <nacos.metadata.version>1.0.0</nacos.metadata.version>
                <log.path>D:\DLUT\iailab-plat</log.path>
                <logstash.address>127.0.0.1:4560</logstash.address>
                <deploy.server>192.168.56.1</deploy.server>
                <deploy.server>172.16.216.132</deploy.server>
            </properties>
            <activation>
                <!-- 默认环境 -->
@@ -156,7 +156,7 @@
                <nacos.username>nacos</nacos.username>
                <nacos.password>nacos</nacos.password>
                <nacos.metadata.version>1.0.0</nacos.metadata.version>
                <log.path>D:\iailab\logs</log.path>
                <log.path>D:\iailab</log.path>
                <logstash.address>127.0.0.1:4560</logstash.address>
                <deploy.server>10.88.4.131</deploy.server>
            </properties>