新增编辑流程接口

pom.xml

@@ -50,10 +50,10 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.8.0</version>
         </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
         </dependency>
 
         <!--flowable整合springboot-->
@@ -106,32 +106,32 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <excludes>
-                    <exclude>**/.svn/*</exclude>
-                </excludes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>src/main/java</directory>-->
+<!--                <includes>-->
+<!--                    <include>**/*</include>-->
+<!--                </includes>-->
+<!--                <excludes>-->
+<!--                    <exclude>**/.svn/*</exclude>-->
+<!--                </excludes>-->
+<!--                <filtering>false</filtering>-->
+<!--            </resource>-->
+<!--        </resources>-->
         <plugins>
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--            </plugin>-->
-
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source> <!--指明源码用的Jdk版本-->
-                    <target>1.8</target> <!--指明打包后的Jdk版本-->
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-compiler-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <source>1.8</source> &lt;!&ndash;指明源码用的Jdk版本&ndash;&gt;-->
+<!--                    <target>1.8</target> &lt;!&ndash;指明打包后的Jdk版本&ndash;&gt;-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

src/main/java/com/tykj/workflowcore/base/aop/EntityAop.java

+package com.tykj.workflowcore.base.aop;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+
+import java.util.Arrays;
+
+/**
+ * ClassName:    EntityAop
+ * Package:    com.tykj.workflowcore.base.aop
+ * Description:
+ * Datetime:    2021/3/11   19:40
+ *
+ * @Author: zsp
+ */
+@Aspect
+public class EntityAop {
+    @Before("execution(* save*(..))")
+    public void permissionCheck(JoinPoint point) {
+        System.out.println("@Before：模拟权限检查...");
+        System.out.println("@Before：目标方法为：" +
+                point.getSignature().getDeclaringTypeName() +
+                "." + point.getSignature().getName());
+        System.out.println("@Before：参数为：" + Arrays.toString(point.getArgs()));
+        System.out.println("@Before：被织入的目标对象为：" + point.getTarget());
+    }
+}

src/main/java/com/tykj/workflowcore/base/entity/BaseEntity.java

+package com.tykj.workflowcore.base.entity;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * ClassName:    BaseEntity
+ * Package:    com.tykj.workflowcore.base.entity
+ * Description:
+ * Datetime:    2021/3/11   19:36
+ *
+ * @Author: zsp
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public abstract class BaseEntity {
+
+    private Date createTime;
+
+    private Date updateTime;
+}

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FlowsInfoController.java

@@ -57,6 +57,12 @@ public class FlowsInfoController {
         return ResultUtil.success(flowsInfoList,"查询成功");
     }
 
+    @GetMapping("editFlow")
+    @ApiOperation(value = "编辑流程")
+    public String editFlow(Long id){
+        return  flowInfoService.editFlow(id).getFilePath();
+
+    }
     @GetMapping("/deploy")
     @ApiOperation(value = "部署流程",notes = "部署成功")
     public ResponseEntity deploy(Long id) throws FileNotFoundException {
@@ -105,7 +111,7 @@ public class FlowsInfoController {
     }
 
     @PostMapping("/createFlow")
-    @ApiModelProperty("创建成功")
+    @ApiModelProperty("创建流程")
     public ResponseEntity createFlow(@RequestBody FlowsInfoVo flowsInfovo){
         return ResultUtil.success(workFlowService.createFlow(flowsInfovo.toEntity()),"流程创建成功");
     }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/FlowsInfo.java

 package com.tykj.workflowcore.workflow_editer.entity;
 
+import com.tykj.workflowcore.base.entity.BaseEntity;
 import com.tykj.workflowcore.model_layer.annotatiion.WorkFlowCoreNoScan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,7 +28,7 @@ import java.util.Date;
 @Entity
 @WorkFlowCoreNoScan
 @Api("流程表")
-public class FlowsInfo {
+public class FlowsInfo extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty("流程id")
@@ -54,12 +55,6 @@ public class FlowsInfo {
     @ApiModelProperty("文件路径")
     private String filePath;
 
-    @ApiModelProperty("流程创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("流程修改时间")
-    private Date updateTime;
-
     @ApiModelProperty("流程描述")
     private String flowDescribe;
 

src/main/java/com/tykj/workflowcore/workflow_editer/service/FlowInfoService.java

@@ -74,5 +74,12 @@ public interface FlowInfoService {
      */
     Page<FlowsInfo> searchFlowInfo(SearchFlowInfoVo searchFlowInfoVo);
 
+    /**
+     * 编辑流程
+     * @param id 流程id
+     * @return
+     */
+    FlowsInfo editFlow(Long id);
+
 
 }

src/main/java/com/tykj/workflowcore/workflow_editer/service/WorkFlowService.java

@@ -81,6 +81,11 @@ public interface WorkFlowService {
      */
 //    Map<String,Object> findTaskDetail(DetailTaskVo detailTaskVo);
 
+    /**
+     * 查看具体的任务详情
+     * @param taskId 任务id
+     * @return 任务列表
+     */
     Map<String,Object> findTaskDetail(String taskId);
 
 

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/FlowInfoServiceImpl.java

@@ -97,4 +97,10 @@ public class FlowInfoServiceImpl implements FlowInfoService {
         and.like(searchFlowInfoVo.getFlowName()!=null,"flowName","%"+searchFlowInfoVo.getFlowName()+"%");
         return flowsInfoMapper.findAll(and.build(), searchFlowInfoVo.getPageable());
     }
+
+    @Override
+    public FlowsInfo editFlow(Long id) {
+        return flowsInfoMapper.findById(id).get();
+    }
+
 }

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/UserServiceImpl.java

+package com.tykj.workflowcore.workflow_editer.service.impl;
+
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowRole;
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowRoleType;
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowUser;
+import com.tykj.workflowcore.workflow_editer.service.UserService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * ClassName:    UserService
+ * Package:    com.tykj.service
+ * Description:
+ * Datetime:    2021/2/25   13:53
+ *
+ * @Author: zsp
+ */
+@Service
+public class UserServiceImpl implements UserService {
+
+
+    @Override
+    public WorkFlowUser getCurrentUser() {
+        return null;
+    }
+
+    @Override
+    public List<WorkFlowUser> getAllUser() {
+        return null;
+    }
+
+    @Override
+    public List<WorkFlowRole> getAllRole(String roleType) {
+        return null;
+    }
+
+    @Override
+    public List<WorkFlowRoleType> getRoleType() {
+        return null;
+    }
+}

src/main/java/com/tykj/workflowcore/workflow_editer/vo/FlowsInfoVo.java

 package com.tykj.workflowcore.workflow_editer.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
 import com.tykj.workflowcore.workflow_editer.entity.NodeInfo;
 import com.tykj.workflowcore.workflow_editer.entity.vo.NodeInfoVo;