diff --git a/flowable-engine-java/UserMapper.xml b/flowable-engine-java/UserMapper.xml new file mode 100644 index 0000000..eb71ee3 --- /dev/null +++ b/flowable-engine-java/UserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into crm_user + + username, + email, + phone, + phone_type, + sex, + avatar, + password, + status, + dept_type, + position, + del_flag, + create_by, + create_time, + update_by, + update_time, + remark + + + #{username}, + #{email}, + #{phone}, + #{phoneType}, + #{sex}, + #{avatar}, + #{password}, + #{status}, + #{deptType}, + #{position}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + insert into crm_user_role (user_id, role_id) value (#{userId}, #{roleId}) + + + + + insert into crm_user_role (user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + insert into crm_user_dept (user_id, dept_id) values + + (#{item.userId},#{item.deptId}) + + + + + delete + from crm_user_role + where user_id = #{userId} + + + + delete + from crm_user_dept + where user_id = #{userId} + + + + update crm_user + + username = #{username}, + email = #{email}, + phone = #{phone}, + phone_type = #{phoneType}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + dept_type = #{deptType}, + position = #{position}, + del_flag = #{delFlag}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where id = #{id} + + + + delete from crm_user where id = #{userId} + + and dept_type = #{deptType} + + + + \ No newline at end of file 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 deleted file mode 100644 index 839020f..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowController.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.odliken.flow.controller; - - -import cn.odliken.flow.comment.Result; -import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupsBo; -import cn.odliken.flow.service.FlowService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.UUID; - -@RestController -@RequestMapping("/flow") -public class FlowController { - - @Autowired - private FlowService flowService; - - - - @GetMapping("/detail/{formId}") - public Result detail(@PathVariable String formId){ - return Result.ok(flowService.selectFlowByFormId(formId)); - } - - - @PostMapping("/add") - public Result add(@RequestBody Flow flow){ - flow.setFormId(UUID.randomUUID().toString()); - flow.setIsStop(1); - flow.setIsStop(1); - flowService.insertFlow(flow); - return Result.ok(); - } - - - @GetMapping("/list") - public Result> groups(){ - return Result.ok(flowService.getGroups()); - } - - - @PutMapping("/edit") - public Result edit(Flow flow){ - if (StringUtils.isNotEmpty(flow.getFormId())){ - return Result.error("id不能为空"); - } - - return Result.ok(); - } - -} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowDataController.java b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowDataController.java new file mode 100644 index 0000000..bacb18c --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowDataController.java @@ -0,0 +1,62 @@ +package cn.odliken.flow.controller; + + +import cn.odliken.flow.comment.Result; +import cn.odliken.flow.pojo.FlowData; +import cn.odliken.flow.pojo.FlowGroupBo; +import cn.odliken.flow.service.FlowDataService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.UUID; + +@RestController +@RequestMapping("/flow/data") +public class FlowDataController { + + @Autowired + private FlowDataService flowDataService; + + + @GetMapping("/{formId}") + public Result detail(@PathVariable String formId) { + return Result.ok(flowDataService.selectFlowByFormId(formId)); + } + + @PostMapping + public Result add(@RequestBody FlowData flowData) { + flowData.setFormId(UUID.randomUUID().toString()); + flowData.setIsStop(0); + flowData.setIsStop(0); + flowDataService.insertFlow(flowData); + return Result.ok(); + } + + + @GetMapping("/list") + public Result> groups(FlowData flowData) { + return Result.ok(flowDataService.getGroups(flowData)); + } + + + @PutMapping + public Result edit(@RequestBody FlowData flowData) { + if (StringUtils.isEmpty(flowData.getFormId())) { + return Result.error("id不能为空"); + } + flowDataService.updateFlow(flowData); + return Result.ok(); + } + + @DeleteMapping("/{id}") + public Result del(@PathVariable String id) { + if (StringUtils.isEmpty(id)) { + return Result.error(); + } + flowDataService.deleteById(id); + return Result.ok(); + } + +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowGroupController.java b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowGroupController.java new file mode 100644 index 0000000..ee4f1ca --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/controller/FlowGroupController.java @@ -0,0 +1,59 @@ +package cn.odliken.flow.controller; + + +import cn.odliken.flow.comment.Result; +import cn.odliken.flow.pojo.FlowGroup; +import cn.odliken.flow.service.FlowGroupService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/flow/group") +public class FlowGroupController { + + + @Resource + private FlowGroupService flowGroupService; + + + @GetMapping("/{id}") + public Result info(@PathVariable long id) { + return Result.ok(flowGroupService.getGroupById(id)); + } + + + @GetMapping("/list") + public Result> list() { + return Result.ok(flowGroupService.getGroupsList()); + } + + + @PostMapping + public Result add(@RequestBody FlowGroup flowGroup) { + flowGroupService.insertGroups(flowGroup); + return Result.ok(); + } + + @PutMapping + public Result edit(@RequestBody FlowGroup flowGroup) { + if (flowGroup.getId() < 0) { + return Result.error(); + } + flowGroupService.updateGroup(flowGroup); + return Result.ok(); + } + + + @DeleteMapping("/{id}") + public Result del(@PathVariable long id) { + if (id < 0) { + return Result.error(); + } + flowGroupService.deleteGroupById(id); + return Result.ok(); + } + + +} 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 deleted file mode 100644 index 0fcbd30..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/controller/GroupController.java +++ /dev/null @@ -1,24 +0,0 @@ -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/FlowDataMapper.java b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowDataMapper.java new file mode 100644 index 0000000..8bff91e --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowDataMapper.java @@ -0,0 +1,25 @@ +package cn.odliken.flow.mapper; + +import cn.odliken.flow.pojo.FlowData; +import cn.odliken.flow.pojo.FlowGroupBo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + + +public interface FlowDataMapper { + + FlowData selectFlowByFromId(@Param("formId") String formId); + + List getGroups(FlowData flowData); + + int insertFlow(FlowData flowData); + + int updateFlow(FlowData flowData); + + int deleteById(@Param("formId") String formId); + + + +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowGroupMapper.java b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowGroupMapper.java new file mode 100644 index 0000000..db57fd4 --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowGroupMapper.java @@ -0,0 +1,22 @@ +package cn.odliken.flow.mapper; + +import cn.odliken.flow.pojo.FlowGroup; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface FlowGroupMapper { + + List getGroupsList(); + + + int insertGroups(FlowGroup flowGroup); + + FlowGroup getGroupById(@Param("id") long id); + + int updateGroup(FlowGroup flowGroup); + + int deleteGroupById(@Param("id") long id); + + +} 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 deleted file mode 100644 index 5d54897..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/FlowMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.odliken.flow.mapper; - -import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupsBo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - - -public interface FlowMapper { - - Flow selectFlowByFromId(@Param("formId") String formId); - - 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 deleted file mode 100644 index 3962ee3..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/mapper/GroupMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.odliken.flow.mapper; - -import cn.odliken.flow.pojo.GroupsBo; - -import java.util.List; - -public interface GroupMapper { - - List getGroupsList(); - - - int insertGroups(); - - -} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Flow.java b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowData.java similarity index 94% rename from flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Flow.java rename to flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowData.java index e33ab58..415e911 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Flow.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowData.java @@ -3,7 +3,7 @@ package cn.odliken.flow.pojo; import lombok.Data; @Data -public class Flow { +public class FlowData { private String created; private String formId; private String formItems; diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowVo.java b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowDataVo.java similarity index 94% rename from flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowVo.java rename to flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowDataVo.java index c0482fe..40f6d2e 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowVo.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowDataVo.java @@ -3,7 +3,7 @@ package cn.odliken.flow.pojo; import lombok.Data; @Data -public class FlowVo { +public class FlowDataVo { private String created; private String formId; private String formItems; 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/FlowGroup.java similarity index 80% rename from flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Groups.java rename to flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowGroup.java index f8fff6e..a2b5273 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/Groups.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowGroup.java @@ -3,7 +3,7 @@ package cn.odliken.flow.pojo; import lombok.Data; @Data -public class Groups { +public class FlowGroup { private long id; private String name; } diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupsBo.java b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowGroupBo.java similarity index 68% rename from flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupsBo.java rename to flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowGroupBo.java index 64192c1..aa13d95 100644 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/GroupsBo.java +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/pojo/FlowGroupBo.java @@ -5,8 +5,8 @@ import lombok.Data; import java.util.List; @Data -public class GroupsBo { +public class FlowGroupBo { private long id; private String name; - private List items; + private List items; } diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowDataService.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowDataService.java new file mode 100644 index 0000000..c121a4c --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowDataService.java @@ -0,0 +1,23 @@ +package cn.odliken.flow.service; + +import cn.odliken.flow.pojo.FlowData; +import cn.odliken.flow.pojo.FlowGroupBo; + +import java.util.List; + +public interface FlowDataService { + + + int insertFlow(FlowData flowData); + + + FlowData selectFlowByFormId(String formId); + + + List getGroups(FlowData flowData); + + int updateFlow(FlowData flowData); + + + int deleteById(String formId); +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowGroupService.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowGroupService.java new file mode 100644 index 0000000..b5f867a --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowGroupService.java @@ -0,0 +1,21 @@ +package cn.odliken.flow.service; + +import cn.odliken.flow.pojo.FlowGroup; + +import java.util.List; + +public interface FlowGroupService { + + List getGroupsList(); + + + int insertGroups(FlowGroup flowGroup); + + FlowGroup getGroupById(long id); + + int updateGroup(FlowGroup flowGroup); + + int deleteGroupById(long id); + + +} 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 deleted file mode 100644 index 57e26e9..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/service/FlowService.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.odliken.flow.service; - -import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupsBo; - -import java.util.List; - -public interface FlowService { - - - - - int insertFlow(Flow flow); - - - - Flow selectFlowByFormId(String formId); - - - 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 deleted file mode 100644 index 31a7601..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/service/GroupService.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.odliken.flow.service; - -public interface GroupService { -} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowDataServiceImpl.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowDataServiceImpl.java new file mode 100644 index 0000000..4477dc7 --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowDataServiceImpl.java @@ -0,0 +1,42 @@ +package cn.odliken.flow.service.impl; + +import cn.odliken.flow.mapper.FlowDataMapper; +import cn.odliken.flow.pojo.FlowData; +import cn.odliken.flow.pojo.FlowGroupBo; +import cn.odliken.flow.service.FlowDataService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class FlowDataServiceImpl implements FlowDataService { + + @Resource + private FlowDataMapper flowDataMapper; + + @Override + public int insertFlow(FlowData flowData) { + return flowDataMapper.insertFlow(flowData); + } + + @Override + public FlowData selectFlowByFormId(String formId) { + return flowDataMapper.selectFlowByFromId(formId); + } + + @Override + public List getGroups(FlowData flowData) { + return flowDataMapper.getGroups(flowData); + } + + @Override + public int updateFlow(FlowData flowData) { + return flowDataMapper.updateFlow(flowData); + } + + @Override + public int deleteById(String formId) { + return flowDataMapper.deleteById(formId); + } +} diff --git a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowGroupServiceImpl.java b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowGroupServiceImpl.java new file mode 100644 index 0000000..6fd9107 --- /dev/null +++ b/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowGroupServiceImpl.java @@ -0,0 +1,41 @@ +package cn.odliken.flow.service.impl; + +import cn.odliken.flow.mapper.FlowGroupMapper; +import cn.odliken.flow.pojo.FlowGroup; +import cn.odliken.flow.service.FlowGroupService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class FlowGroupServiceImpl implements FlowGroupService { + + @Resource + private FlowGroupMapper flowGroupMapper; + + @Override + public List getGroupsList() { + return flowGroupMapper.getGroupsList(); + } + + @Override + public int insertGroups(FlowGroup flowGroup) { + return flowGroupMapper.insertGroups(flowGroup); + } + + @Override + public FlowGroup getGroupById(long id) { + return flowGroupMapper.getGroupById(id); + } + + @Override + public int updateGroup(FlowGroup flowGroup) { + return flowGroupMapper.updateGroup(flowGroup); + } + + @Override + public int deleteGroupById(long id) { + return flowGroupMapper.deleteGroupById(id); + } +} 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 deleted file mode 100644 index 11eb165..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/FlowServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.odliken.flow.service.impl; - -import cn.odliken.flow.mapper.FlowMapper; -import cn.odliken.flow.pojo.Flow; -import cn.odliken.flow.pojo.GroupsBo; -import cn.odliken.flow.service.FlowService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class FlowServiceImpl implements FlowService { - - @Resource - private FlowMapper flowMapper; - - @Override - public int insertFlow(Flow flow) { - return flowMapper.insertFlow(flow); - } - - @Override - public Flow selectFlowByFormId(String formId) { - return flowMapper.selectFlowByFromId(formId); - } - - @Override - 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 deleted file mode 100644 index ddc0a05..0000000 --- a/flowable-engine-java/src/main/java/cn/odliken/flow/service/impl/GroupServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -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/FlowDataMapper.xml b/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml new file mode 100644 index 0000000..f494165 --- /dev/null +++ b/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + insert into flow_data + + created, + form_id, + form_items, + form_name, + group_id, + is_delete, + is_stop, + logo, + flowData.process, + remark, + settings, + sort, + updated, + + + #{created}, + #{formId}, + #{formItems}, + #{formName}, + #{groupId}, + #{isDelete}, + #{isStop}, + #{logo}, + #{process}, + #{remark}, + #{settings}, + #{sort}, + #{updated}, + + + + + + update flow_data + + created = #{created}, + form_items = #{formItems}, + form_name = #{formName}, + group_id = #{groupId}, + is_delete = #{isDelete}, + is_stop = #{isStop}, + logo = #{logo}, + process = #{process}, + remark = #{remark}, + settings = #{settings}, + sort = #{sort}, + updated = #{updated}, + + where form_id = #{formId} + + + update flow_data set is_delete = 1 where form_id = #{formId} + + + + + + + \ No newline at end of file diff --git a/flowable-engine-java/src/main/resources/mapper/FlowGroupMapper.xml b/flowable-engine-java/src/main/resources/mapper/FlowGroupMapper.xml new file mode 100644 index 0000000..9b5bc28 --- /dev/null +++ b/flowable-engine-java/src/main/resources/mapper/FlowGroupMapper.xml @@ -0,0 +1,39 @@ + + + + + + + insert into flow_group + + name, + + + #{name}, + + + + update flow_group + + name = #{name}, + + where id = #{id} + + + update flow_group + set is_delete = 0 + + + + + + + \ No newline at end of file diff --git a/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml b/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml deleted file mode 100644 index dfa4d11..0000000 --- a/flowable-engine-java/src/main/resources/mapper/FlowMapper.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - insert into flow - - created, - formId, - formItems, - formName, - groupId, - isDelete, - isStop, - logo, - flow.process, - remark, - settings, - sort, - updated, - - - #{created}, - #{formId}, - #{formItems}, - #{formName}, - #{groupId}, - #{isDelete}, - #{isStop}, - #{logo}, - #{process}, - #{remark}, - #{settings}, - #{sort}, - #{updated}, - - - - - - - - - - \ No newline at end of file diff --git a/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml b/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml deleted file mode 100644 index 2d7836b..0000000 --- a/flowable-engine-java/src/main/resources/mapper/GroupMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - insert into flowable_group - - name, - - - #{name}, - - - - - - - \ No newline at end of file diff --git a/flowable-engine-web/package-lock.json b/flowable-engine-web/package-lock.json index 4544cb7..7c756e7 100644 --- a/flowable-engine-web/package-lock.json +++ b/flowable-engine-web/package-lock.json @@ -1824,16 +1824,6 @@ "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", @@ -1860,34 +1850,6 @@ "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", @@ -1909,25 +1871,6 @@ "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", @@ -1992,16 +1935,6 @@ "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", @@ -2018,18 +1951,6 @@ "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" - } } } }, @@ -12023,6 +11944,87 @@ } } }, + "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", diff --git a/flowable-engine-web/src/api/design.js b/flowable-engine-web/src/api/design.js index 046044f..a16c916 100644 --- a/flowable-engine-web/src/api/design.js +++ b/flowable-engine-web/src/api/design.js @@ -3,10 +3,11 @@ import request from '@/api/request.js' // 查询表单组 export function getFormGroups(param) { + console.log(param,"param") return request({ - url: "/flow/groups", + url: "/flow/data/list", method: "get", - param: param + params: param }) } @@ -20,18 +21,39 @@ export function groupItemsSort(param) { } // 更新表单组 -export function updateGroup(param, method) { +export function updateGroup(param) { return request({ - url: 'admin/form/group', - method: method, + url: 'flow/group', + method: "put", params: param }) } + +export function addGroup(param){ + return request({ + url: 'flow/group', + method: "post", + data: param + }) +} + + +export function delGroup(id){ + return request({ + url: 'flow/group/'+id, + method: "delete", + }) +} + + + + + // 获取表单分组 export function getGroup() { return request({ - url: 'admin/form/group/list', + url: 'flow/group/list', method: 'get' }) } @@ -45,9 +67,17 @@ export function updateForm(param) { }) } +// 更新表单 +export function deleteForm(id) { + return request({ + url: 'admin/form/'+id, + method: 'delete', + }) +} + export function createForm(param){ return request({ - url: '/flow/add', + url: '/flow/data', method: 'post', data: param }) @@ -56,7 +86,7 @@ export function createForm(param){ // 查询表单详情 export function getFormDetail(id) { return request({ - url: 'flow/detail/' + id, + url: 'flow/data/' + id, method: 'get' }) } @@ -64,7 +94,7 @@ export function getFormDetail(id) { // 更新表单详情 export function updateFormDetail(param) { return request({ - url: 'admin/form/detail', + url: 'flow/data', method: 'put', data: param }) diff --git a/flowable-engine-web/src/api/request.js b/flowable-engine-web/src/api/request.js index ded1c4c..ee90ac3 100644 --- a/flowable-engine-web/src/api/request.js +++ b/flowable-engine-web/src/api/request.js @@ -5,6 +5,7 @@ import { Notification, MessageBox, Message } from "element-ui"; // 第三方插件 import "element-ui/lib/theme-chalk/index.css"; +import da from "element-ui/src/locale/lang/da"; Vue.prototype.$axios = axios; // 字体图标 @@ -30,8 +31,12 @@ service.interceptors.request.use( service.interceptors.response.use( rsp => { - - return rsp.data; + let data = rsp.data + if (data.success){ + return data + }else { + Notification.error({ title: "提醒", message: "服务器出了点小错误" }) + } }, // 拦截异常的响应 err => { diff --git a/flowable-engine-web/src/views/admin/FormProcessDesign.vue b/flowable-engine-web/src/views/admin/FormProcessDesign.vue index 38fba50..d5113cf 100644 --- a/flowable-engine-web/src/views/admin/FormProcessDesign.vue +++ b/flowable-engine-web/src/views/admin/FormProcessDesign.vue @@ -245,12 +245,12 @@ export default { }) } else { console.log(JSON.stringify(template)) - // updateFormDetail(template).then(rsp => { - // this.$message.success("更新表单成功") - // this.$router.push("/formsPanel") - // }).catch(err => { - // this.$message.error(err) - // }) + updateFormDetail(template).then(rsp => { + this.$message.success("更新表单成功") + this.$router.push("/formsPanel") + }).catch(err => { + this.$message.error(err) + }) } }) } diff --git a/flowable-engine-web/src/views/admin/FormsPanel.vue b/flowable-engine-web/src/views/admin/FormsPanel.vue index 33e2b2f..012e09f 100644 --- a/flowable-engine-web/src/views/admin/FormsPanel.vue +++ b/flowable-engine-web/src/views/admin/FormsPanel.vue @@ -71,7 +71,7 @@ import draggable from "vuedraggable"; import { getFormGroups, groupItemsSort, - getFormDetail, updateGroup, updateForm + getFormDetail, updateGroup, updateForm, addGroup, delGroup, deleteForm } from '@/api/design' export default { @@ -126,7 +126,8 @@ export default { inputErrorMessage: '分组名不能为空且长度小于30', inputPlaceholder: '请输入分组名' }).then(({value}) => { - updateGroup({name: value}, 'post').then(rsp => { + console.log(value) + addGroup({name: value}).then(rsp => { this.$message.success(rsp.data) this.getGroups() }).catch(err => this.$message.error(err.response.data)) @@ -138,7 +139,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - updateGroup({id: group.id}, 'delete').then(rsp => { + delGroup(group.id).then(rsp => { this.$message.success(rsp.data) this.getGroups() }).catch(err => this.$message.error(err.response.data)) @@ -153,7 +154,7 @@ export default { inputPlaceholder: '请输入分组名', inputValue: group.name }).then(({value}) => { - updateGroup({id: group.id, name: value}, 'put').then(rsp => { + updateGroup({id: group.id, name: value}).then(rsp => { this.$message.success(rsp.data) this.getGroups() }).catch(err => this.$message.error(err.response.data)) @@ -188,14 +189,14 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.updateForm(item, 'delete'); + this.deleteForm(item.id); }) } else { if (this.moveSelect === null || this.moveSelect === ''){ this.$message.error('请选择分组') return; } - updateForm({templateId: item.id, type: 'move', groupId: this.moveSelect}).then(rsp => { + updateForm(item.id).then(rsp => { this.$message.success(rsp.data) this.getGroups() this.moveSelect = null diff --git a/flowable-engine-web/src/views/admin/layout/FormBaseSetting.vue b/flowable-engine-web/src/views/admin/layout/FormBaseSetting.vue index 28b4b56..e126eb4 100644 --- a/flowable-engine-web/src/views/admin/layout/FormBaseSetting.vue +++ b/flowable-engine-web/src/views/admin/layout/FormBaseSetting.vue @@ -25,7 +25,7 @@ - @@ -61,7 +61,7 @@