第一次整合

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

 package com.tykj.workflowcore.workflow_editer.controller;
 
-import com.tykj.entity.FlowsInfo;
-import com.tykj.service.FlowInfoService;
-import com.tykj.service.NodePageService;
-import com.tykj.service.VariableStorageService;
-import com.tykj.service.WorkFlowService;
-import com.tykj.vo.DeployedVo;
-import com.tykj.vo.FlowsInfoVo;
-import com.tykj.vo.PageVo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.service.FlowInfoService;
+import com.tykj.workflowcore.workflow_editer.service.NodePageService;
+import com.tykj.workflowcore.workflow_editer.service.VariableStorageService;
+import com.tykj.workflowcore.workflow_editer.service.WorkFlowService;
+import com.tykj.workflowcore.workflow_editer.vo.DeployedVo;
+import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
+import com.tykj.workflowcore.workflow_editer.vo.PageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;

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

 package com.tykj.workflowcore.workflow_editer.controller;
 
-import com.tykj.entity.FormPage;
-import com.tykj.service.FormPageService;
-import com.tykj.vo.FormPageVo;
+import com.tykj.workflowcore.workflow_editer.entity.FormPage;
+import com.tykj.workflowcore.workflow_editer.service.FormPageService;
+import com.tykj.workflowcore.workflow_editer.vo.FormPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

 package com.tykj.workflowcore.workflow_editer.controller;
 
-import com.tykj.entity.PageEntity;
-import com.tykj.service.PageEntityService;
+import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
+import com.tykj.workflowcore.workflow_editer.service.PageEntityService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

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

 package com.tykj.workflowcore.workflow_editer.controller;
 
-import com.tykj.entity.FlowsInfo;
-import com.tykj.service.FlowInfoService;
-import com.tykj.service.WorkFlowService;
-import com.tykj.util.PageUtil;
-import com.tykj.vo.PageVo;
-import com.tykj.vo.StartFlowVo;
-import com.tykj.vo.SuspendVo;
-import com.tykj.vo.TaskVo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.service.FlowInfoService;
+import com.tykj.workflowcore.workflow_editer.service.WorkFlowService;
+import com.tykj.workflowcore.workflow_editer.util.PageUtil;
+import com.tykj.workflowcore.workflow_editer.vo.PageVo;
+import com.tykj.workflowcore.workflow_editer.vo.StartFlowVo;
+import com.tykj.workflowcore.workflow_editer.vo.SuspendVo;
+import com.tykj.workflowcore.workflow_editer.vo.TaskVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/FlowsInfoMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.FlowsInfo;
+
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/FormPageMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.FormPage;
+import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/NodePageMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodePage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/PageEntityMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.PageEntity;
+import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/RoleMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.Role;
+import com.tykj.workflowcore.workflow_editer.entity.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/UserMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.User;
+import com.tykj.workflowcore.workflow_editer.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/VariableStorageMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.entity.VariableStorage;
+import com.tykj.workflowcore.workflow_editer.entity.VariableStorage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

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

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.entity.FlowsInfo;
-import com.tykj.vo.FlowsInfoVo;
-import com.tykj.vo.PageVo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
+import com.tykj.workflowcore.workflow_editer.vo.PageVo;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestBody;
 

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

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.entity.FormPage;
-import com.tykj.vo.FormPageVo;
+import com.tykj.workflowcore.workflow_editer.entity.FormPage;
+import com.tykj.workflowcore.workflow_editer.vo.FormPageVo;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 

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

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodePage;
 
 /**
  * ClassName:    NodePageService

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

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.entity.PageEntity;
+import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
 
 /**
  * ClassName:    PageEntityService

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

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.entity.VariableStorage;
+import com.tykj.workflowcore.workflow_editer.entity.VariableStorage;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**

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

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.entity.FlowsInfo;
-import com.tykj.vo.FlowsInfoVo;
-import com.tykj.vo.StartFlowVo;
-import com.tykj.vo.SuspendVo;
-import com.tykj.vo.TaskVo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
+import com.tykj.workflowcore.workflow_editer.vo.StartFlowVo;
+import com.tykj.workflowcore.workflow_editer.vo.SuspendVo;
+import com.tykj.workflowcore.workflow_editer.vo.TaskVo;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
 import com.github.wenhao.jpa.Specifications;
-import com.tykj.entity.FlowsInfo;
-import com.tykj.mapper.FlowsInfoMapper;
-import com.tykj.service.FlowInfoService;
-import com.tykj.vo.FlowsInfoVo;
-import com.tykj.vo.PageVo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.mapper.FlowsInfoMapper;
+import com.tykj.workflowcore.workflow_editer.service.FlowInfoService;
+import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
+import com.tykj.workflowcore.workflow_editer.vo.PageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
-import com.tykj.entity.FormPage;
-import com.tykj.mapper.FormPageMapper;
-import com.tykj.service.FormPageService;
-import com.tykj.vo.FormPageVo;
-import org.modelmapper.ModelMapper;
+
+import com.tykj.workflowcore.workflow_editer.entity.FormPage;
+import com.tykj.workflowcore.workflow_editer.mapper.FormPageMapper;
+import com.tykj.workflowcore.workflow_editer.service.FormPageService;
+import com.tykj.workflowcore.workflow_editer.vo.FormPageVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import springfox.documentation.swagger2.mappers.ModelMapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,8 +40,8 @@ public class FormPageServiceImpl implements FormPageService {
     public FormPageVo getPage(@PathVariable("id") Long id) {
 
         FormPage formPage = formPageMapper.findById(id).get();
-        ModelMapper modelMapper = new ModelMapper();
-        FormPageVo formPageVo = modelMapper.map(formPage, FormPageVo.class);
+        FormPageVo formPageVo = new FormPageVo();
+        BeanUtils.copyProperties(formPage,formPageVo);
         return formPageVo;
     }
 
@@ -51,11 +53,12 @@ public class FormPageServiceImpl implements FormPageService {
     @Override
     public List<FormPageVo> getAllPages() {
 
-        ModelMapper modelMapper = new ModelMapper();
+
         ArrayList<FormPageVo> formPageVos = new ArrayList<>();
         List<FormPage> formPages = formPageMapper.findAll();
         for (FormPage formPage : formPages) {
-            FormPageVo formPageVo = modelMapper.map(formPage, FormPageVo.class);
+            FormPageVo formPageVo = new FormPageVo();
+            BeanUtils.copyProperties(formPage,formPageVo);
             formPageVos.add(formPageVo);
         }
         return formPageVos;

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
-import com.tykj.entity.NodePage;
-import com.tykj.mapper.NodePageMapper;
-import com.tykj.service.NodePageService;
+import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.mapper.NodePageMapper;
+import com.tykj.workflowcore.workflow_editer.service.NodePageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
-import com.tykj.entity.PageEntity;
-import com.tykj.mapper.PageEntityMapper;
-import com.tykj.service.PageEntityService;
+import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
+import com.tykj.workflowcore.workflow_editer.mapper.PageEntityMapper;
+import com.tykj.workflowcore.workflow_editer.service.PageEntityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
-import com.tykj.entity.VariableStorage;
-import com.tykj.mapper.VariableStorageMapper;
-import com.tykj.service.VariableStorageService;
+import com.tykj.workflowcore.workflow_editer.entity.VariableStorage;
+import com.tykj.workflowcore.workflow_editer.mapper.VariableStorageMapper;
+import com.tykj.workflowcore.workflow_editer.service.VariableStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
-import com.tykj.entity.FlowsInfo;
-import com.tykj.entity.NodePage;
-import com.tykj.entity.Role;
-import com.tykj.entity.User;
-import com.tykj.mapper.FlowsInfoMapper;
-import com.tykj.mapper.RoleMapper;
-import com.tykj.mapper.UserMapper;
-import com.tykj.service.NodePageService;
-import com.tykj.service.WorkFlowService;
-import com.tykj.vo.FlowsInfoVo;
-import com.tykj.vo.StartFlowVo;
-import com.tykj.vo.SuspendVo;
-import com.tykj.vo.TaskVo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.Role;
+import com.tykj.workflowcore.workflow_editer.entity.User;
+import com.tykj.workflowcore.workflow_editer.mapper.FlowsInfoMapper;
+import com.tykj.workflowcore.workflow_editer.mapper.RoleMapper;
+import com.tykj.workflowcore.workflow_editer.mapper.UserMapper;
+import com.tykj.workflowcore.workflow_editer.service.NodePageService;
+import com.tykj.workflowcore.workflow_editer.service.WorkFlowService;
+import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
+import com.tykj.workflowcore.workflow_editer.vo.StartFlowVo;
+import com.tykj.workflowcore.workflow_editer.vo.SuspendVo;
+import com.tykj.workflowcore.workflow_editer.vo.TaskVo;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;

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

 package com.tykj.workflowcore.workflow_editer.vo;
 
-import com.tykj.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodePage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;