Browse Source

1、修改动态配置报修表单;

2、替换默认个人图标;
dev
mh 5 months ago
parent
commit
d07cbfa9cb
  1. 2
      ruoyi-admin/src/main/resources/application-dev.yml
  2. 2
      ruoyi-admin/src/main/resources/application-prod.yml
  3. 27
      ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfModelServiceImpl.java
  4. BIN
      ruoyi-ui/src/assets/images/profile.jpg

2
ruoyi-admin/src/main/resources/application-dev.yml

@ -106,7 +106,7 @@ spring:
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 3
# 密码(如没有密码请注释掉) # 密码(如没有密码请注释掉)
# password: # password:
# 连接超时时间 # 连接超时时间

2
ruoyi-admin/src/main/resources/application-prod.yml

@ -109,7 +109,7 @@ spring:
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 3
# 密码(如没有密码请注释掉) # 密码(如没有密码请注释掉)
# password: # password:
# 连接超时时间 # 连接超时时间

27
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfModelServiceImpl.java

@ -9,10 +9,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.flowable.common.constant.ProcessConstants; import com.ruoyi.flowable.common.constant.ProcessConstants;
import com.ruoyi.flowable.common.enums.FormType; import com.ruoyi.flowable.common.enums.FormType;
import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.flowable.factory.FlowServiceFactory; import com.ruoyi.flowable.factory.FlowServiceFactory;
import com.ruoyi.flowable.utils.ModelUtils; import com.ruoyi.flowable.utils.ModelUtils;
import com.ruoyi.flowable.utils.ProcessUtils;
import com.ruoyi.workflow.domain.bo.WfModelBo; import com.ruoyi.workflow.domain.bo.WfModelBo;
import com.ruoyi.workflow.domain.dto.WfMetaInfoDto; import com.ruoyi.workflow.domain.dto.WfMetaInfoDto;
import com.ruoyi.workflow.domain.vo.WfFormVo; import com.ruoyi.workflow.domain.vo.WfFormVo;
@ -24,10 +27,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.StartEvent; import org.flowable.bpmn.model.StartEvent;
import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.*;
import org.flowable.engine.repository.Model;
import org.flowable.engine.repository.ModelQuery;
import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -338,6 +338,25 @@ public class WfModelServiceImpl extends FlowServiceFactory implements IWfModelSe
.singleResult(); .singleResult();
// 修改流程定义的分类,便于搜索流程 // 修改流程定义的分类,便于搜索流程
repositoryService.setProcessDefinitionCategory(procDef.getId(), model.getCategory()); repositoryService.setProcessDefinitionCategory(procDef.getId(), model.getCategory());
// 查询流程表单
// 流程定义列表数据查询
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
.latestVersion()
.orderByProcessDefinitionKey()
.asc();
// 构建搜索条件
ProcessQuery processQuery = new ProcessQuery();
processQuery.setProcessKey("Process_1713957566353");
ProcessUtils.buildProcessSearch(processDefinitionQuery, processQuery);
int offset = 0;
List<ProcessDefinition> definitionList = processDefinitionQuery.listPage(offset, 10);
if (definitionList.size() != 0) {
RedisUtils.deleteKeys("bx_process");
ProcessDefinition processDefinition = definitionList.get(0);
// https://bx.mhito.net/bx/start/876cc19d-022d-11ef-a8d0-525400c95f47?definitionId=Process_1713957566353%3A1%3A87b98210-022d-11ef-a8d0-525400c95f47
RedisUtils.setCacheObject("bx_process_url", "https://bx.mhito.net/bx/start/"
+processDefinition.getDeploymentId() + "?definitionId=" + processDefinition.getId());
}
// 保存部署表单 // 保存部署表单
return deployFormService.saveInternalDeployForm(deployment.getId(), bpmnModel); return deployFormService.saveInternalDeployForm(deployment.getId(), bpmnModel);
} }

BIN
ruoyi-ui/src/assets/images/profile.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Loading…
Cancel
Save