diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowController.java b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowController.java index 3a143e8..839020f 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowController.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowController.java @@ -3,11 +3,9 @@ package cn.odliken.flow.controller; import cn.odliken.flow.comment.Result; import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.FlowVo; -import cn.odliken.flow.pojo.GroupBo; +import cn.odliken.flow.pojo.GroupsBo; import cn.odliken.flow.service.FlowService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,8 +37,8 @@ public class FlowController { } - @GetMapping("/groups") - public Result> groups(){ + @GetMapping("/list") + public Result> groups(){ return Result.ok(flowService.getGroups()); } diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/GroupController.java b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/GroupController.java new file mode 100644 index 0000000..0fcbd30 --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/GroupController.java @@ -0,0 +1,24 @@ +package cn.odliken.flow.controller; + + +import cn.odliken.flow.comment.Result; +import cn.odliken.flow.pojo.Groups; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/group") +public class GroupController { + + + + @GetMapping + public Result list(){ + + } + + + + +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowMapper.java b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowMapper.java index 566c145..5d54897 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowMapper.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowMapper.java @@ -1,7 +1,7 @@ package cn.odliken.flow.mapper; import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupBo; +import cn.odliken.flow.pojo.GroupsBo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,7 +11,7 @@ public interface FlowMapper { Flow selectFlowByFromId(@Param("formId") String formId); - List getGroups(); + List getGroups(); int insertFlow(Flow flow); diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/GroupMapper.java b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/GroupMapper.java index 819fbe3..3962ee3 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/GroupMapper.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/GroupMapper.java @@ -1,12 +1,15 @@ package cn.odliken.flow.mapper; -import cn.odliken.flow.pojo.GroupBo; +import cn.odliken.flow.pojo.GroupsBo; import java.util.List; public interface GroupMapper { - List selectGroups(); + List getGroupsList(); + + + int insertGroups(); } diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Groups.java b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Groups.java new file mode 100644 index 0000000..f8fff6e --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Groups.java @@ -0,0 +1,9 @@ +package cn.odliken.flow.pojo; + +import lombok.Data; + +@Data +public class Groups { + private long id; + private String name; +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupBo.java b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupsBo.java similarity index 86% rename from flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupBo.java rename to flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupsBo.java index 0231dd9..64192c1 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupBo.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupsBo.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.List; @Data -public class GroupBo { +public class GroupsBo { private long id; private String name; private List items; diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowService.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowService.java index 2c137e9..57e26e9 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowService.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowService.java @@ -1,7 +1,7 @@ package cn.odliken.flow.service; import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupBo; +import cn.odliken.flow.pojo.GroupsBo; import java.util.List; @@ -17,7 +17,7 @@ public interface FlowService { Flow selectFlowByFormId(String formId); - List getGroups(); + List getGroups(); } diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/GroupService.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/GroupService.java new file mode 100644 index 0000000..31a7601 --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/GroupService.java @@ -0,0 +1,4 @@ +package cn.odliken.flow.service; + +public interface GroupService { +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowServiceImpl.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowServiceImpl.java index d04048f..11eb165 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowServiceImpl.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowServiceImpl.java @@ -2,7 +2,7 @@ package cn.odliken.flow.service.impl; import cn.odliken.flow.mapper.FlowMapper; import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupBo; +import cn.odliken.flow.pojo.GroupsBo; import cn.odliken.flow.service.FlowService; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ public class FlowServiceImpl implements FlowService { } @Override - public List getGroups() { + public List getGroups() { return flowMapper.getGroups(); } } diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/GroupServiceImpl.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/GroupServiceImpl.java new file mode 100644 index 0000000..ddc0a05 --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/GroupServiceImpl.java @@ -0,0 +1,12 @@ +package cn.odliken.flow.service.impl; + +import cn.odliken.flow.service.GroupService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class GroupServiceImpl implements GroupService { + + +} diff --git a/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml b/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml index 1c44f42..dfa4d11 100644 --- a/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml +++ b/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml @@ -1,7 +1,7 @@ - + @@ -74,7 +74,7 @@ sort, created, updated - from `group` g + from flowable_group g left join flow f on f.groupId = g.id diff --git a/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml b/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml index 34d22d3..2d7836b 100644 --- a/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml +++ b/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml @@ -1,10 +1,22 @@ - + - select id, name - from `group` + from flowable_group diff --git a/flowable-engine-web/package-lock.json b/flowable-engine-web/package-lock.json index 7c756e7..4544cb7 100644 --- a/flowable-engine-web/package-lock.json +++ b/flowable-engine-web/package-lock.json @@ -1824,6 +1824,16 @@ "integrity": "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw=", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594428108619&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", @@ -1850,6 +1860,34 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.3.1.tgz", @@ -1871,6 +1909,25 @@ "path-exists": "^4.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz", @@ -1935,6 +1992,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1597229595508&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz", @@ -1951,6 +2018,18 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -11944,87 +12023,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.3", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.3.tgz?cache=0&sync_timestamp=1598983087864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.3.tgz",