This commit is contained in:
clay 2022-08-13 20:07:23 +08:00
parent 0c81178373
commit 507ddbeef1
13 changed files with 160 additions and 100 deletions

View File

@ -3,11 +3,9 @@ package cn.odliken.flow.controller;
import cn.odliken.flow.comment.Result; import cn.odliken.flow.comment.Result;
import cn.odliken.flow.pojo.Flow; import cn.odliken.flow.pojo.Flow;
import cn.odliken.flow.pojo.FlowVo; import cn.odliken.flow.pojo.GroupsBo;
import cn.odliken.flow.pojo.GroupBo;
import cn.odliken.flow.service.FlowService; import cn.odliken.flow.service.FlowService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -39,8 +37,8 @@ public class FlowController {
} }
@GetMapping("/groups") @GetMapping("/list")
public Result<List<GroupBo>> groups(){ public Result<List<GroupsBo>> groups(){
return Result.ok(flowService.getGroups()); return Result.ok(flowService.getGroups());
} }

View File

@ -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<Groups> list(){
}
}

View File

@ -1,7 +1,7 @@
package cn.odliken.flow.mapper; package cn.odliken.flow.mapper;
import cn.odliken.flow.pojo.Flow; 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 org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -11,7 +11,7 @@ public interface FlowMapper {
Flow selectFlowByFromId(@Param("formId") String formId); Flow selectFlowByFromId(@Param("formId") String formId);
List<GroupBo> getGroups(); List<GroupsBo> getGroups();
int insertFlow(Flow flow); int insertFlow(Flow flow);

View File

@ -1,12 +1,15 @@
package cn.odliken.flow.mapper; package cn.odliken.flow.mapper;
import cn.odliken.flow.pojo.GroupBo; import cn.odliken.flow.pojo.GroupsBo;
import java.util.List; import java.util.List;
public interface GroupMapper { public interface GroupMapper {
List<GroupBo> selectGroups(); List<GroupsBo> getGroupsList();
int insertGroups();
} }

View File

@ -0,0 +1,9 @@
package cn.odliken.flow.pojo;
import lombok.Data;
@Data
public class Groups {
private long id;
private String name;
}

View File

@ -5,7 +5,7 @@ import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class GroupBo { public class GroupsBo {
private long id; private long id;
private String name; private String name;
private List<Flow> items; private List<Flow> items;

View File

@ -1,7 +1,7 @@
package cn.odliken.flow.service; package cn.odliken.flow.service;
import cn.odliken.flow.pojo.Flow; import cn.odliken.flow.pojo.Flow;
import cn.odliken.flow.pojo.GroupBo; import cn.odliken.flow.pojo.GroupsBo;
import java.util.List; import java.util.List;
@ -17,7 +17,7 @@ public interface FlowService {
Flow selectFlowByFormId(String formId); Flow selectFlowByFormId(String formId);
List<GroupBo> getGroups(); List<GroupsBo> getGroups();
} }

View File

@ -0,0 +1,4 @@
package cn.odliken.flow.service;
public interface GroupService {
}

View File

@ -2,7 +2,7 @@ package cn.odliken.flow.service.impl;
import cn.odliken.flow.mapper.FlowMapper; import cn.odliken.flow.mapper.FlowMapper;
import cn.odliken.flow.pojo.Flow; 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 cn.odliken.flow.service.FlowService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -26,7 +26,7 @@ public class FlowServiceImpl implements FlowService {
} }
@Override @Override
public List<GroupBo> getGroups() { public List<GroupsBo> getGroups() {
return flowMapper.getGroups(); return flowMapper.getGroups();
} }
} }

View File

@ -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 {
}

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.odliken.flow.mapper.FlowMapper"> <mapper namespace="cn.odliken.flow.mapper.FlowMapper">
<resultMap id="GroupResult" type="cn.odliken.flow.pojo.GroupBo"> <resultMap id="GroupResult" type="cn.odliken.flow.pojo.GroupsBo">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="name" property="name"/> <result column="name" property="name"/>
<collection property="items" ofType="cn.odliken.flow.pojo.Flow"> <collection property="items" ofType="cn.odliken.flow.pojo.Flow">
@ -74,7 +74,7 @@
sort, sort,
created, created,
updated updated
from `group` g from flowable_group g
left join flow f on f.groupId = g.id left join flow f on f.groupId = g.id
</select> </select>

View File

@ -1,10 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.odliken.flow.mapper.FlowMapper"> <mapper namespace="cn.odliken.flow.mapper.GroupMapper">
<select id="getGroupList" resultType="cn.odliken.flow.pojo.GroupBo">
<insert id="insertGroups">
insert into flowable_group
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null and name !=''">name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null and name !=''">#{name},</if>
</trim>
</insert>
<select id="getGroupsList" resultType="cn.odliken.flow.pojo.GroupsBo">
select id, name select id, name
from `group` from flowable_group
</select> </select>

View File

@ -1824,6 +1824,16 @@
"integrity": "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw=", "integrity": "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw=",
"dev": true "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": { "cacache": {
"version": "13.0.1", "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", "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" "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": { "find-cache-dir": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.3.1.tgz", "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" "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": { "locate-path": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz", "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz",
@ -1935,6 +1992,16 @@
"minipass": "^3.1.1" "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": { "terser-webpack-plugin": {
"version": "2.3.8", "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", "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", "terser": "^4.6.12",
"webpack-sources": "^1.4.3" "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": { "vue-router": {
"version": "3.4.3", "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", "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",