Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整依赖

Browse Source
This commit is contained in:
wanggeng 2022-05-25 01:19:31 +08:00
parent 7f592e05b0
commit 5ed1d971d2
4 changed files with 80 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
login-wechat/pom.xml
View File

@ -16,6 +16,7 @@
<groupId>ink.wgink</groupId>
<artifactId>login-base</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ink.wgink</groupId>

67
module-activiti/pom.xml
View File

@ -15,18 +15,66 @@
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>module-form</artifactId>
<version>1.0-SNAPSHOT</version>
<version>${parent.version}</version>
<exclusions>
<exclusion>
<artifactId>jackson-annotations</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- activiti start -->
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter-basic</artifactId>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</exclusion>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-json-converter</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>org.activiti</groupId>
<artifactId>activiti-bpmn-model</artifactId>
@ -36,6 +84,12 @@
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-image-generator</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- activiti end -->
@ -57,6 +111,17 @@
<artifactId>batik-svggen</artifactId>
</dependency>
<!-- xml graphics end -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<exclusions>
<exclusion>
<artifactId>jackson-core</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

4
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/NodeButtonServiceImpl.java
View File

@ -1,6 +1,7 @@
package ink.wgink.module.activiti.service.oa.impl;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.SaveException;
import ink.wgink.module.activiti.dao.oa.INodeButtonDao;
import ink.wgink.module.activiti.pojo.dtos.oa.NodeButtonDTO;
import ink.wgink.module.activiti.pojo.vos.oa.nodemanage.config.NodeFormButtonVO;
@ -27,6 +28,9 @@ public class NodeButtonServiceImpl extends DefaultBaseService implements INodeBu
@Override
public void save(String modelId, Integer modelVersion, String nodeId, int nodeIndex, String formId, NodeFormButtonVO nodeButton) {
if(nodeButton == null) {
throw new SaveException("节点按钮不能为空");
}
Map<String, Object> params = HashMapUtil.beanToMap(nodeButton);
params.put("nodeButtonId", UUIDUtil.getUUID());
params.put("modelId", modelId);

9
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaOnFileServiceImpl.java
View File

@ -343,6 +343,9 @@ public class OaOnFileServiceImpl extends DefaultBaseService implements IOaOnFile
* @param oaOnFileDTOs
*/
private void setProcessInstanceParams(List<OaOnFileDTO> oaOnFileDTOs) {
if (oaOnFileDTOs.isEmpty()) {
return;
}
List<String> processInstanceIds = ArrayListUtil.listBeanStringIdValue(oaOnFileDTOs, "processInstanceId", OaOnFileDTO.class);
List<HistoricProcessInstance> historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
.processInstanceIds(new HashSet<>(processInstanceIds))
@ -372,6 +375,9 @@ public class OaOnFileServiceImpl extends DefaultBaseService implements IOaOnFile
* @return
*/
private List<OaOnFileDTO> listUnOnFile(Set<String> processInstanceIdSet) {
if (processInstanceIdSet.isEmpty()) {
return new ArrayList<>();
}
return historyService.createHistoricProcessInstanceQuery()
.processInstanceIds(processInstanceIdSet)
.includeProcessVariables()
@ -404,6 +410,9 @@ public class OaOnFileServiceImpl extends DefaultBaseService implements IOaOnFile
* @return
*/
private List<OaOnFileDTO> listFinishedUnOnFile(Set<String> processInstanceIdSet) {
if (processInstanceIdSet.isEmpty()) {
return new ArrayList<>();
}
return historyService.createHistoricProcessInstanceQuery()
.processInstanceIds(new HashSet<>(processInstanceIdSet))
.finished()