diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 80f4e3d77..ae3f92957 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; -import com.iformall.domain.vo.FlowModelVo; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; @@ -201,10 +201,10 @@ public class WxFlowAbleController extends BaseController { @ApiOperation(value = "创建模板",notes = "{\"taskId\":\"\",\"processInstanceId\":\"\",\"remark\":\"\"}") @PostMapping(value = "createModel") @SystemControllerLog(description = "工作流-创建模板") - public ResultData createModel(@ModelAttribute FlowModelVo modelVo) { - MallUserInfo user = getUser(); - modelVo.setTenantId(getTenantId()); - return wxFlowService.createModel(modelVo); + public ResultData createModel(@ModelAttribute WxFlowModel wxFlowModel) { + wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.setCreateUser(getUserId()); + return wxFlowService.createModel(wxFlowModel); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java new file mode 100644 index 000000000..76b34a7d8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -0,0 +1,47 @@ +package com.iformall.domain.po; + +import com.iformall.domain.vo.UserTaskVo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +/** + * @author luozukai + * @date 2019/6/6 10:50 + */ +@Table(name = "wx_flow_model") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxFlowModel extends BaseEntity { + @Id + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") + private String name; + + @io.swagger.annotations.ApiModelProperty(value="流程",name="flow") + private String flow; + + @io.swagger.annotations.ApiModelProperty(value="创建用户",name="createUser") + private Long createUser; + + @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") + private Date createDate; + + @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") + private Date updateDate; + + @Transient + private List taskList; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java deleted file mode 100644 index 59f6a2c68..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.iformall.domain.vo; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class FlowModelVo implements Serializable{ - - private static final long serialVersionUID = 1L; - - @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") - private String name; - - @io.swagger.annotations.ApiModelProperty(value="节点列表",name="taskList") - private List taskList; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java new file mode 100644 index 000000000..d49fb73a9 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java @@ -0,0 +1,15 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFlowModel; + +import java.util.List; + + +/** + * @author gongbiao + */ +public interface WxFlowModelMapper extends CommonMapper { + List findList(WxFlowModel wxFlowModel); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 5eed0630a..fd41d83a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -2,9 +2,8 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCarCmdLog; +import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; -import com.iformall.domain.vo.FlowModelVo; import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletResponse; import java.util.Map; @@ -94,5 +93,11 @@ public interface WxFlowService { * 创建模板 * @return */ - ResultData createModel(FlowModelVo modelVo); + ResultData createModel(WxFlowModel wxFlowModel); + + /** + * 模板列表 + * @return + */ + PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index bd7671442..76acba992 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.domain.vo.FlowModelVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -21,7 +20,6 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.UserTask; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; import org.flowable.engine.runtime.Execution; @@ -92,6 +90,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxBillOtherMapper wxBillOtherMapper; @Autowired private WxBillOtherDepositMapper wxBillOtherDepositMapper; + @Autowired + private WxFlowModelMapper wxFlowModelMapper; /** * 获取流程key,1合同 2账单 @@ -1134,7 +1134,13 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData createModel(FlowModelVo modelVo) { - return null; + public ResultData createModel(WxFlowModel wxFlowModel) { + wxFlowModelMapper.insertSelective(wxFlowModel); + return new ResultData(); + } + + @Override + public PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowModelMapper.findList(wxFlowModel)); } } diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml new file mode 100644 index 000000000..75d1d1e7e --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + where 1 = 1 + + and `tenant_id` = #{tenantId} + + and `id` = #{id} + and `name` = #{name} + + order by ${sortColumns} + order by id desc + + + + + + + + +