diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java index de59be8b7d..00187b5a63 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -20,28 +21,29 @@ public interface SysProUrlFeign { */ @PostMapping("/list") @ResponseBody - public ResultBean> list(@RequestBody PagerQuery pq) ; + public ResultBean> list(@RequestBody PagerQuery pq); + - /** * 获取流程业务表单url对象 */ @GetMapping(value = "/getSysProUrl/{formId}") @ResponseBody - public ResultBean getSysProUrl(@PathVariable("formId") int formId); + public ResultBean getSysProUrl(@PathVariable("formId") int formId); + /** * 根据流程实例id获取form信息 */ @GetMapping(value = "/getForm/{proId}") @ResponseBody - public ResultBean getForm(@PathVariable("proId") String proId); + public ResultBean getForm(@PathVariable("proId") String proId); /** * 新增流程业务表单url对象 */ - @PostMapping(value="/add") + @PostMapping(value = "/add") @ResponseBody - public ResultBean add(@RequestBody SysProUrl sysProUrl) ; + public ResultBean add(@RequestBody SysProUrl sysProUrl); /** * 修改流程业务表单url对象 @@ -62,4 +64,20 @@ public interface SysProUrlFeign { @ApiOperation("app根据流程定义id,节点id,终端及类型查询流程与业务表单url") @PostMapping("/selectAppUrlByTaskDefKey") ResultBean selectAppUrlByTaskDefKey(@Valid @RequestBody AppSysProUrlQuery query); + + + /** + * pc根据流程定义id,节点id,终端及类型查询流程与业务表单url + * + * @param procDefId 流程定义id + * @param taskDefKey 节点id + * @param type 类型:1办理,2详情 + * @return + */ + @ApiOperation("查询流程与业务表单的url") + @GetMapping("/selectUrlByKey") + ResultBean selectUrlByKey(@ApiParam(value = "流程定义id") @RequestParam(value = "procDefId") String procDefId, + @ApiParam(value = "节点id") @RequestParam(value = "taskDefKey") String taskDefKey, + @ApiParam(value = "类型:1办理,2详情") @RequestParam(value = "type") String type); + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java index 76e46169b8..e3e49a5c1a 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java @@ -54,4 +54,9 @@ public class SysProUrlFeignFallBack implements SysProUrlFeign { public ResultBean selectAppUrlByTaskDefKey(AppSysProUrlQuery query) { return null; } + + @Override + public ResultBean selectUrlByKey(String procDefId, String taskDefKey, String type) { + return null; + } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java index 86b3c2f664..5754114293 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java @@ -40,16 +40,16 @@ public class SysProUrlController implements SysProUrlFeign { @Override public ResultBean getSysProUrl(int formId) { - ResultBean< SysProUrl> rb = ResultBean.fireFail(); + ResultBean rb = ResultBean.fireFail(); SysProUrl sysProUrl = sysProUrlService.selectSysProUrlById(formId); - return rb.success().setData(sysProUrl); + return rb.success().setData(sysProUrl); } @Override public ResultBean getForm(String proId) { - ResultBean< SysForm> rb = ResultBean.fireFail(); + ResultBean rb = ResultBean.fireFail(); SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(proId); - return rb.success().setData(sysForm); + return rb.success().setData(sysForm); } /** @@ -73,7 +73,7 @@ public class SysProUrlController implements SysProUrlFeign { @DeleteMapping("/{formIds}") @Override public ResultBean remove(@PathVariable Long[] formIds) { - sysProUrlService.deleteSysProUrlByIds(formIds); + sysProUrlService.deleteSysProUrlByIds(formIds); ResultBean rb = ResultBean.fireFail(); return rb.success().setMsg("操作成功"); } @@ -106,4 +106,17 @@ public class SysProUrlController implements SysProUrlFeign { } return new ResultBean().success().setData(appUrlVo); } + + /** + * pc根据流程定义id,节点id,终端及类型查询流程与业务表单url + * + * @param procDefId 流程定义id + * @param taskDefKey 节点id + * @param type 类型:1办理,2详情 + * @return + */ + @Override + public ResultBean selectUrlByKey(String procDefId, String taskDefKey, String type) { + return sysProUrlService.selectUrlByKey(procDefId, taskDefKey, type); + } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java index 6541eeb645..bea6ceed0a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java @@ -79,4 +79,14 @@ public interface SysProUrlMapper extends BaseMapper { List selectListByProcDefId(@Param("proc_def_id") String proc_def_id, @Param("taskDefKey") String taskDefKey); SysProUrlVo selectUniByTaskDefKey(SysProUrlQuery query); + + /** + * pc根据流程定义id,节点id,终端及类型查询流程与业务表单url + * + * @param procDefId 流程id + * @param taskDefKey 节点iD + * @param type 类型:1办理,2详情 + * @return + */ + String selectUrlByKey(@Param("procDefId") String procDefId, @Param("taskDefKey") String taskDefKey, @Param("type") String type); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml index f9f2872f01..6afab06bd6 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml @@ -2,50 +2,96 @@ - + insert into sys_pro_url - url, - type, - terminal, - formId, - title + + url, + + + type, + + + terminal, + + + formId, + + + title + - #{url}, - #{type}, - #{terminal}, - #{formId}, - #{title}, + + #{url}, + + + #{type}, + + + #{terminal}, + + + #{formId}, + + + #{title}, + - delete from sys_pro_url where sid in + delete + from sys_pro_url where sid in #{sid} - + select id as id, url as url, type as type, terminal as terminal, formId as formId, title as title + from sys_pro_url where formId = #{formId} - + SELECT url, modulePluginName FROM sys_pro_url - WHERE proc_def_id=#{proc_def_id} AND type=#{type} AND terminal=#{terminal} AND taskDefKey=#{taskDefKey} + WHERE proc_def_id = #{proc_def_id} + AND type = #{type} + AND terminal = #{terminal} + AND taskDefKey = #{taskDefKey} + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java index 4a58e738b0..8b408c89ea 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java @@ -20,7 +20,7 @@ import java.util.List; /** * 流程表单Service业务层处理 - * + * * @author XuanXuan Xuan * @date 2021-04-03 */ @@ -33,18 +33,17 @@ public class SysProUrlService extends MybatisBaseService selectSysProUrlList(PagerQuery pagerQuery) { List SysProUrls = baseMapper.selectListVo(); - IPage page =new Page<>();// PagerUtil.queryToPage(pagerQuery); + IPage page = new Page<>();// PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = createQueryWrapper(pagerQuery.getParams()); List SysProUrlVoList = baseMapper.getSysProUrlVoList(page, qw); int total = baseMapper.getSysProUrlVoTotal(page, qw); @@ -55,46 +54,42 @@ public class SysProUrlService extends MybatisBaseService selectUrlByKey(String procDefId, String taskDefKey, String type) { + ResultBean rb = ResultBean.fireFail(); + //验证参数 + if (StringUtils.isBlank(procDefId)) { + return rb.setMsg("流程定义id不能为空"); + } + if (StringUtils.isBlank(taskDefKey)) { + return rb.setMsg("节点id不能为空"); + } + if (StringUtils.isBlank(type)) { + return rb.setMsg("请指定要操作的类型"); + } + String url = baseMapper.selectUrlByKey(procDefId, taskDefKey, type); + return null; + } }