新增页面和实体的绑定

src/main/java/com/tykj/workflowcore/base/result/ResultUtil.java

@@ -18,8 +18,8 @@ public class ResultUtil<T> {
      *
      * @param data 获取的数据
      */
-    public static <T> ResponseEntity<ResultObj<T>> success(T data) {
-        return ResponseEntity.ok(new ResultObj<>(data));
+    public static <T> ResponseEntity<ResultObj<T>> success(T data,String message) {
+        return ResponseEntity.ok(new ResultObj<>(data,message));
     }
 
     /**

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

@@ -84,9 +84,9 @@ public class FlowsInfoController {
 //        return xml;
 //    }
 
-    @GetMapping("/deploy/{id}")
+    @GetMapping("/deploy")
     @ApiOperation(value = "部署流程",notes = "0 部署成功")
-    public Integer deploy(@PathVariable("id") Long id) throws FileNotFoundException {
+    public Integer deploy(Long id) throws FileNotFoundException {
         //根据id 查询出flowsInfo
         FlowsInfo flowsInfo = flowInfoService.findById(id);
         if (flowsInfo.getState() == 0){

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

 package com.tykj.workflowcore.workflow_editer.controller;
 
+import com.tykj.workflowcore.base.result.ResultObj;
+import com.tykj.workflowcore.base.result.ResultUtil;
+import com.tykj.workflowcore.model_layer.model.TableInfo;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
-import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
+//import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
 import com.tykj.workflowcore.workflow_editer.service.FormPageService;
-import com.tykj.workflowcore.workflow_editer.service.PageEntityService;
+//import com.tykj.workflowcore.workflow_editer.service.PageEntityService;
 import com.tykj.workflowcore.workflow_editer.vo.InFormPageVo;
 import com.tykj.workflowcore.workflow_editer.vo.OutFormPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -28,26 +32,25 @@ public class FormPageController {
 
     @Autowired
     private FormPageService formPageService;
-    @Autowired
-    private PageEntityService pageEntityService;
+//    @Autowired
+//    private PageEntityService pageEntityService;
 
     @ApiOperation("保存页面")
     @PostMapping("/savePage")
-    public Long savePage(@RequestBody InFormPageVo inFormPageVo){
-        List<String> entityIds = inFormPageVo.getEntityIds();
-        for (String entityId : entityIds) {
-            PageEntity pageEntity = new PageEntity();
-            pageEntity.setEntityId(entityId);
-            pageEntity.setPageId(formPageService.savePage(inFormPageVo));
-            pageEntityService.savePageEntity(pageEntity);
+    public ResponseEntity savePage(@RequestBody InFormPageVo inFormPageVo){
+        if (inFormPageVo.getId() == null){
+            Long pageId = formPageService.savePage(inFormPageVo);
+            return ResultUtil.success(pageId,"页面保存成功");
+        }else {
+            //修改
+            FormPage formPage = inFormPageVo.toEntity();
+            formPageService.update(formPage);
+            return ResultUtil.success(inFormPageVo.getId(),"页面保存成功");
         }
-        return  formPageService.savePage(inFormPageVo);
-
     }
-
     @ApiOperation("回显页面")
-    @GetMapping("/EchoPage/{id}")
-    public FormPage EchoPage(@PathVariable("id") Long id){
+    @GetMapping("/EchoPage")
+    public FormPage EchoPage(Long id){
         return  formPageService.getPage(id);
     }
 
@@ -58,9 +61,14 @@ public class FormPageController {
     }
 
     @ApiOperation("删除页面")
-    @DeleteMapping("deletePage/{id}")
-    public void deletePage(@PathVariable("id") Long id){
+    @DeleteMapping("deletePage")
+    public void deletePage(Long id){
         formPageService.deletePage(id);
     }
 
+    @PostMapping("/findByPages")
+    public List<TableInfo> findByPages(@RequestBody List<Long> pageIds){
+        return formPageService.findByPageIds(pageIds);
+    }
+
 }

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

-package com.tykj.workflowcore.workflow_editer.controller;
-
-import com.tykj.workflowcore.model_layer.model.TableInfo;
-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;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * ClassName:    PageEntityController
- * Package:    com.tykj.controller
- * Description:
- * Datetime:    2021/3/4   9:50
- *
- * @Author: zsp
- */
-@RestController
-@RequestMapping("/pageEntity")
-@Api("页面跟实体的管理")
-
-public class PageEntityController {
-
-    @Autowired
-    private PageEntityService pageEntityService;
-
-    @PostMapping("/savePageEntity")
-    public void savePageEntity(@RequestBody PageEntity pageEntity){
-        pageEntityService.savePageEntity(pageEntity);
-    }
-
-    @PostMapping("/findByPages")
-    public List<TableInfo> findByPages(List<Integer> pageIds){
-
-        return pageEntityService.findByPageIds(pageIds);
-    }
-}
+//package com.tykj.workflowcore.workflow_editer.controller;
+//
+//import com.tykj.workflowcore.model_layer.model.TableInfo;
+//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;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+///**
+// * ClassName:    PageEntityController
+// * Package:    com.tykj.controller
+// * Description:
+// * Datetime:    2021/3/4   9:50
+// *
+// * @Author: zsp
+// */
+//@RestController
+//@RequestMapping("/pageEntity")
+//@Api("页面跟实体的管理")
+//
+//public class PageEntityController {
+//
+//    @Autowired
+//    private PageEntityService pageEntityService;
+//
+//    @PostMapping("/savePageEntity")
+//    public void savePageEntity(@RequestBody PageEntity pageEntity){
+//        pageEntityService.savePageEntity(pageEntity);
+//    }
+//
+//    @PostMapping("/findByPages")
+//    public List<TableInfo> findByPages(List<Integer> pageIds){
+//
+//        return pageEntityService.findByPageIds(pageIds);
+//    }
+//}

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

@@ -91,9 +91,9 @@ public class WorkFlowController {
         workFlowService.suspendOrActivateProcessDefinitionByKey(suspendVo);
     }
 
-    @DeleteMapping("/deleteFlow/{deployId}")
+    @DeleteMapping("/deleteFlow")
     @ApiOperation("是否删除")
-    public void deleteFlow(@PathVariable("deployId") String deployId){
+    public void deleteFlow(String deployId){
         //根据流程id查询出flowsInfo
         FlowsInfo flowsInfo = flowInfoService.findByDeployId(deployId);
         //删除flowsInfo

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

@@ -59,6 +59,9 @@ public class FormPage {
     @ApiModelProperty("json描述文件")
     private String descFile;
 
+    @ApiModelProperty("实体类id")
+    private String entityId;
+
     public OutFormPageVo toEntityVo(){
         OutFormPageVo outFormPageVo = new OutFormPageVo();
         BeanUtils.copyProperties(this,outFormPageVo);

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

-package com.tykj.workflowcore.workflow_editer.entity;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * ClassName:    PageEntity
- * Package:    com.tykj.entity
- * Description:
- * Datetime:    2021/3/3   10:51
- *
- * @Author: zsp
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@Api("页面实体关系")
-public class PageEntity {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty("主键id")
-    private Long id;
-
-    @ApiModelProperty("页面Id")
-    private Long pageId;
-
-    @ApiModelProperty("实体类Id")
-    private String entityId;
-}
+//package com.tykj.workflowcore.workflow_editer.entity;
+//
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.AllArgsConstructor;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//
+//import javax.persistence.Entity;
+//import javax.persistence.GeneratedValue;
+//import javax.persistence.GenerationType;
+//import javax.persistence.Id;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * ClassName:    PageEntity
+// * Package:    com.tykj.entity
+// * Description:
+// * Datetime:    2021/3/3   10:51
+// *
+// * @Author: zsp
+// */
+//@Data
+//@AllArgsConstructor
+//@NoArgsConstructor
+//@Entity
+//@Api("页面实体关系")
+//public class PageEntity {
+//
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @ApiModelProperty("主键id")
+//    private Long id;
+//
+//    @ApiModelProperty("页面Id")
+//    private Long pageId;
+//
+//    @ApiModelProperty("实体类Id")
+//    private String entityId;
+//}

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

-package com.tykj.workflowcore.workflow_editer.entity;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * ClassName:    Result
- * Package:    com.tykj.entity
- * Description: 返回类型
- * Datetime:    2021/2/23   10:18
- *
- * @Author: zsp
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Api("统一返回结果集")
-public class Result {
-    @ApiModelProperty("返回状态")
-    private Integer status;
-
-    @ApiModelProperty("返回信息")
-    private String message;
-}

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

 package com.tykj.workflowcore.workflow_editer.service;
 
+import com.tykj.workflowcore.model_layer.model.TableInfo;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 import com.tykj.workflowcore.workflow_editer.vo.InFormPageVo;
 import com.tykj.workflowcore.workflow_editer.vo.OutFormPageVo;
@@ -25,6 +26,12 @@ public interface FormPageService {
      */
     Long savePage(@RequestBody InFormPageVo inFormPageVo);
 
+    /**
+     * 保存页面
+     * @param formPage 页面实体
+     * @return 主键id
+     */
+    void update(FormPage formPage);
     /**
      * 根据页面id来进行回显
      * @param id 页面id
@@ -44,4 +51,10 @@ public interface FormPageService {
      */
     List<OutFormPageVo> getAllPages();
 
+    /**
+     * 根据页面id查询tableInfo
+     * @param pageIds 页面id
+     * @return
+     */
+    List<TableInfo> findByPageIds(List<Long> pageIds);
 }

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

-package com.tykj.workflowcore.workflow_editer.service;
-
-import com.tykj.workflowcore.model_layer.model.TableInfo;
-import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
-
-import java.util.List;
-
-/**
- * ClassName:    PageEntityService
- * Package:    com.tykj.service
- * Description:
- * Datetime:    2021/3/4   9:52
- *
- * @Author: zsp
- */
-public interface PageEntityService {
-
-    /**
-     * 保存
-     * @param pageEntity 页面实体之间关系
-     */
-    void savePageEntity(PageEntity pageEntity);
-
-    /**
-     * 根据页面id查询tableInfo
-     * @param pageIds 页面id
-     * @return
-     */
-    List<TableInfo> findByPageIds(List<Integer> pageIds);
-
-
-}
+//package com.tykj.workflowcore.workflow_editer.service;
+//
+//import com.tykj.workflowcore.model_layer.model.TableInfo;
+//import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
+//
+//import java.util.List;
+//
+///**
+// * ClassName:    PageEntityService
+// * Package:    com.tykj.service
+// * Description:
+// * Datetime:    2021/3/4   9:52
+// *
+// * @Author: zsp
+// */
+//public interface PageEntityService {
+//
+//    /**
+//     * 保存
+//     * @param pageEntity 页面实体之间关系
+//     */
+//    void savePageEntity(PageEntity pageEntity);
+//
+//    /**
+//     * 根据页面id查询tableInfo
+//     * @param pageIds 页面id
+//     * @return
+//     */
+//    List<TableInfo> findByPageIds(List<Integer> pageIds);
+//
+//
+//}

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

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
 
+import com.github.wenhao.jpa.PredicateBuilder;
+import com.github.wenhao.jpa.Specifications;
+import com.tykj.workflowcore.model_layer.dao.TableInfoDao;
+import com.tykj.workflowcore.model_layer.model.TableInfo;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 import com.tykj.workflowcore.workflow_editer.mapper.FormPageMapper;
 import com.tykj.workflowcore.workflow_editer.service.FormPageService;
@@ -28,7 +32,8 @@ public class FormPageServiceImpl implements FormPageService {
 
     @Autowired
     private FormPageMapper formPageMapper;
-
+    @Autowired
+    private TableInfoDao tableInfoDao;
     @Override
     public Long savePage(@RequestBody InFormPageVo inFormPageVo) {
         inFormPageVo.setCreateTime(new Date());
@@ -38,6 +43,11 @@ public class FormPageServiceImpl implements FormPageService {
         return id;
     }
 
+    @Override
+    public void update(FormPage formPage) {
+        formPageMapper.save(formPage);
+    }
+
     @Override
     public FormPage getPage(@PathVariable("id") Long id) {
 
@@ -66,5 +76,19 @@ public class FormPageServiceImpl implements FormPageService {
         return formPageVos;
     }
 
+        @Override
+    public List<TableInfo> findByPageIds(List<Long> pageIds) {
+        ArrayList<TableInfo> list = new ArrayList<>();
+        for (Long pageId : pageIds) {
+            //通过pageId 查询出表id
+            String entityId = formPageMapper.findById(pageId).get().getEntityId();
+            //根据entityId查询出表
+            PredicateBuilder<TableInfo> builder = Specifications.and();
+            builder.eq("id",entityId);
+            List<TableInfo> tableInfoList = tableInfoDao.findAll(builder.build());
+            list.addAll(tableInfoList);
+        }
+        return list;
+    }
 
 }

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

-package com.tykj.workflowcore.workflow_editer.service.impl;
-
-import com.tykj.workflowcore.model_layer.dao.TableInfoDao;
-import com.tykj.workflowcore.model_layer.model.TableInfo;
-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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * ClassName:    PageEntityServiceImpl
- * Package:    com.tykj.service.impl
- * Description:
- * Datetime:    2021/3/4   9:55
- *
- * @Author: zsp
- */
-@Service
-public class PageEntityServiceImpl implements PageEntityService {
-
-    @Autowired
-    private PageEntityMapper pageEntityMapper;
-    @Autowired
-    private TableInfoDao tableInfoDao;
-    @Override
-    public void savePageEntity(PageEntity pageEntity) {
-        pageEntityMapper.save(pageEntity);
-    }
-
-    @Override
-    public List<TableInfo> findByPageIds(List<Integer> pageIds) {
-        ArrayList<TableInfo> list = new ArrayList<>();
-        for (Integer pageId : pageIds) {
-            Long entityId = pageEntityMapper.findByPageId(pageId).getEntityId();
-            //根据entityId查询出实体类
-            TableInfo tableInfo = tableInfoDao.findById(entityId).get();
-            list.add(tableInfo);
-        }
-        return list;
-    }
-}
+//package com.tykj.workflowcore.workflow_editer.service.impl;
+//
+//import com.github.wenhao.jpa.PredicateBuilder;
+//import com.github.wenhao.jpa.Specifications;
+//import com.tykj.workflowcore.model_layer.dao.TableInfoDao;
+//import com.tykj.workflowcore.model_layer.model.TableInfo;
+//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;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * ClassName:    PageEntityServiceImpl
+// * Package:    com.tykj.service.impl
+// * Description:
+// * Datetime:    2021/3/4   9:55
+// *
+// * @Author: zsp
+// */
+//@Service
+//public class PageEntityServiceImpl implements PageEntityService {
+//
+//    @Autowired
+//    private PageEntityMapper pageEntityMapper;
+//    @Autowired
+//    private TableInfoDao tableInfoDao;
+//    @Override
+//    public void savePageEntity(PageEntity pageEntity) {
+//        pageEntityMapper.save(pageEntity);
+//    }
+//
+//    @Override
+//    public List<TableInfo> findByPageIds(List<Integer> pageIds) {
+//        ArrayList<TableInfo> list = new ArrayList<>();
+//        for (Integer pageId : pageIds) {
+//            String entityId = pageEntityMapper.findByPageId(pageId).getEntityId();
+//            //根据entityId查询出表
+//            PredicateBuilder<TableInfo> builder = Specifications.and();
+//            builder.eq("id",entityId);
+//            List<TableInfo> tableInfoList = tableInfoDao.findAll(builder.build());
+//            list.addAll(tableInfoList);
+//        }
+//        return list;
+//    }
+//}

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

@@ -24,6 +24,8 @@ import java.util.List;
 @NoArgsConstructor
 public class InFormPageVo {
 
+    @ApiModelProperty("页面id")
+    private Long id;
     @ApiModelProperty("页面名称")
     private String pageName;