java110-interface/src/main/java/com/java110/intf/common/IOaWorkflowActivitiInnerServiceSMO.java
File was renamed from java110-interface/src/main/java/com/java110/intf/common/IOaWorkflowUserInnerServiceSMO.java @@ -2,9 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.PageDto; import com.java110.dto.auditMessage.AuditMessageDto; import com.java110.dto.oaWorkflow.OaWorkflowDto; import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto; import com.java110.entity.audit.AuditUser; import org.springframework.cloud.openfeign.FeignClient; @@ -12,28 +10,52 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import java.util.ArrayList; import java.util.List; @FeignClient(name = "${java110.common-service}", configuration = {FeignConfiguration.class}) @RequestMapping("/oaWorkflowUserApi") public interface IOaWorkflowUserInnerServiceSMO { @RequestMapping("/oaWorkflowActivitiApi") public interface IOaWorkflowActivitiInnerServiceSMO { /** * 启动流程 * * @param reqJson { * createUserId:'', * flowId:'', * id:'', * auditMessage:'', * storeId:'' * } * * @return */ @RequestMapping(value = "/startProcess", method = RequestMethod.POST) JSONObject startProcess(@RequestBody JSONObject reqJson); /** * * @param reqJson { * createUserId:'', * processInstanceId:'', * nextUserId:'', * auditCode:'', * storeId:'', * id:'', * flowId:'' * } * @return */ @RequestMapping(value = "/autoFinishFirstTask", method = RequestMethod.POST) boolean autoFinishFirstTask(@RequestBody JSONObject reqJson); /** * 查询用户任务数 * * @param user * @param user { * flowId:'', * userId:'' * } * @return */ @RequestMapping(value = "/getUserTaskCount", method = RequestMethod.POST) @@ -42,7 +64,10 @@ /** * 获取用户任务 * * @param user 用户信息 * @param user 用户信息 { * flowId:'', * userId:'' * } */ @RequestMapping(value = "/getUserTasks", method = RequestMethod.POST) List<JSONObject> getUserTasks(@RequestBody AuditUser user); @@ -50,7 +75,10 @@ /** * 查询用户处理任务数 * * @param user * @param user { * flowId:'', * userId:'' * } * @return */ @RequestMapping(value = "/getUserHistoryTaskCount", method = RequestMethod.POST) @@ -59,7 +87,10 @@ /** * 获取用户处理审批的任务 * * @param user 用户信息 * @param user 用户信息{ * flowId:'', * userId:'' *} */ @RequestMapping(value = "/getUserHistoryTasks", method = RequestMethod.POST) List<JSONObject> getUserHistoryTasks(@RequestBody AuditUser user); @@ -67,7 +98,10 @@ /** * 查询用户任务数 * * @param user * @param user{ * userId:'', * processDefinitionkeys:[] *} * @return */ @RequestMapping(value = "/getDefinitionKeysUserTaskCount", method = RequestMethod.POST) @@ -76,7 +110,12 @@ /** * 获取用户任务 * * @param user 用户信息 * @param user 用户信息{ * userId:'', * page:1, * row:10, * processDefinitionkeys:[] *} */ @RequestMapping(value = "/getDefinitionKeysUserTasks", method = RequestMethod.POST) List<JSONObject> getDefinitionKeysUserTasks(@RequestBody AuditUser user) ; @@ -84,7 +123,10 @@ /** * 查询用户任务数 * * @param user * @param user{ * userId:'', * processDefinitionkeys:[] * } * @return */ @RequestMapping(value = "/getDefinitionKeysUserHistoryTaskCount", method = RequestMethod.POST) @@ -93,7 +135,12 @@ /** * 获取用户审批的任务 * * @param user 用户信息 * @param user 用户信息{ * userId:'', * page:1, * row:10, * processDefinitionkeys:[] * } */ @RequestMapping(value = "/getDefinitionKeysUserHistoryTasks", method = RequestMethod.POST) List<JSONObject> getDefinitionKeysUserHistoryTasks(@RequestBody AuditUser user) ; @@ -102,7 +149,15 @@ /** * 处理任务 * * @param reqJson * @param reqJson { * taskId:'', * nextUserId:'', * auditMessage:'', * auditCode:'', * id:'', * storeId:'', * flowId:'' * } * @return true 为流程结束 false 为流程没有结束 */ @RequestMapping(value = "/completeTask", method = RequestMethod.POST) @@ -111,7 +166,16 @@ /** * 处理任务 * * @param reqJson * @param reqJson { * storeId:'', * id:'', * nextUserId:'', * taskId:'', * auditMessage:'', * flowId:'', * storeId:'', * * } * @return true 为流程结束 false 为流程没有结束 */ @RequestMapping(value = "/changeTaskToOtherUser", method = RequestMethod.POST) @@ -120,7 +184,12 @@ /** * 处理任务 * * @param reqJson * @param reqJson { * taskId:'', * nextUserId:'', * auditMessage:'', * auditCode:'', * } * @return true 为流程结束 false 为流程没有结束 */ @RequestMapping(value = "/goBackTask", method = RequestMethod.POST) @@ -130,7 +199,10 @@ /** * 查询批注信息 * * @param reqJson * @param reqJson { * taskId:'', * * } * @return */ @RequestMapping(value = "/getAuditMessage", method = RequestMethod.POST) @@ -139,18 +211,31 @@ /** * 获取任务当前处理人 * * @param reqJson * @param reqJson{ * id:'', * * } * @return */ @RequestMapping(value = "/getTaskCurrentUser", method = RequestMethod.POST) JSONObject getTaskCurrentUser(@RequestBody JSONObject reqJson); /** * * @param reqJson{ * taskId:'', * startUserId:'' * } * @return */ @RequestMapping(value = "/nextAllNodeTaskList", method = RequestMethod.POST) List<JSONObject> nextAllNodeTaskList(@RequestBody JSONObject reqJson); /** * * @param oaWorkflowXmlDto * @param oaWorkflowXmlDto { * bpmnXml:'' * } * @return */ @RequestMapping(value = "/queryFirstAuditStaff", method = RequestMethod.POST) service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java
@@ -1,7 +1,6 @@ package com.java110.api.smo.undo.impl; import com.alibaba.fastjson.JSONObject; import com.java110.api.smo.AppAbstractComponentSMO; import com.java110.api.smo.DefaultAbstractComponentSMO; import com.java110.api.smo.undo.IUndoSMO; import com.java110.core.context.IPageData; @@ -9,7 +8,7 @@ import com.java110.dto.workflow.WorkflowDto; import com.java110.entity.audit.AuditUser; import com.java110.entity.component.ComponentValidateResult; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.utils.exception.SMOException; import com.java110.vo.ResultVo; @@ -34,7 +33,7 @@ private RestTemplate restTemplate; @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Autowired service-common/src/main/java/com/java110/common/cmd/itemRelease/AuditUndoItemReleaseCmd.java
@@ -7,7 +7,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.itemRelease.ItemReleaseDto; import com.java110.intf.common.IItemReleaseV1InnerServiceSMO; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.po.itemRelease.ItemReleasePo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; @@ -23,7 +23,7 @@ public class AuditUndoItemReleaseCmd extends Cmd { @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Autowired private IItemReleaseV1InnerServiceSMO itemReleaseV1InnerServiceSMOImpl; service-common/src/main/java/com/java110/common/cmd/itemRelease/QueryFinishItemReleaseCmd.java
@@ -10,7 +10,7 @@ import com.java110.dto.workflow.WorkflowDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IItemReleaseV1InnerServiceSMO; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; @@ -30,7 +30,7 @@ public class QueryFinishItemReleaseCmd extends Cmd { @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Autowired private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl; service-common/src/main/java/com/java110/common/cmd/itemRelease/QueryUndoItemReleaseCmd.java
@@ -10,7 +10,7 @@ import com.java110.dto.workflow.WorkflowDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IItemReleaseV1InnerServiceSMO; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; @@ -30,7 +30,7 @@ public class QueryUndoItemReleaseCmd extends Cmd { @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Autowired private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl; service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
@@ -31,7 +31,7 @@ import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO; import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO; import com.java110.intf.common.IItemReleaseV1InnerServiceSMO; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.po.itemRelease.ItemReleasePo; @@ -134,7 +134,7 @@ private IUserInnerServiceSMO userInnerServiceSMOImpl; @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Override service-common/src/main/java/com/java110/common/cmd/itemRelease/UpdateItemReleaseCmd.java
@@ -24,14 +24,12 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.doc.annotation.*; import com.java110.dto.itemRelease.ItemReleaseDto; import com.java110.dto.itemReleaseType.ItemReleaseTypeDto; import com.java110.dto.oaWorkflow.OaWorkflowDto; import com.java110.dto.user.UserDto; import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO; import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO; import com.java110.intf.common.IItemReleaseV1InnerServiceSMO; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.po.itemRelease.ItemReleasePo; @@ -39,7 +37,6 @@ import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.slf4j.Logger; @@ -114,7 +111,7 @@ private IUserInnerServiceSMO userInnerServiceSMOImpl; @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; public static final String CODE_PREFIX_ID = "10";
File was renamed from service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java @@ -7,13 +7,12 @@ import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.PageDto; import com.java110.dto.auditMessage.AuditMessageDto; import com.java110.dto.oaWorkflow.OaWorkflowDto; import com.java110.dto.oaWorkflowData.OaWorkflowDataDto; import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto; import com.java110.dto.user.UserDto; import com.java110.dto.workflow.WorkflowDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.common.IWorkflowInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; @@ -31,12 +30,10 @@ import org.activiti.engine.history.HistoricTaskInstanceQuery; import org.activiti.engine.impl.identity.Authentication; import org.activiti.engine.query.Query; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Comment; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; import org.activiti.validation.ValidationError; import org.slf4j.Logger; import com.java110.core.log.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,9 +50,9 @@ //@Service("resourceEntryStoreSMOImpl") @RestController public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements IOaWorkflowUserInnerServiceSMO { public class OaWorkflowActivitiInnerServiceSMOImpl extends BaseServiceSMO implements IOaWorkflowActivitiInnerServiceSMO { private static Logger logger = LoggerFactory.getLogger(OaWorkflowUserInnerServiceSMOImpl.class); private static Logger logger = LoggerFactory.getLogger(OaWorkflowActivitiInnerServiceSMOImpl.class); @Autowired private ProcessEngine processEngine; @@ -271,7 +268,7 @@ * 查询用户任务数 * * @param user{ userId:'' * processDefinitionkeys * processDefinitionkeys:[] * } * @return */ @@ -285,7 +282,10 @@ /** * 获取用户任务 * * @param user 用户信息 * @param user 用户信息{ * processDefinitionKeys:[], * * } */ public List<JSONObject> getDefinitionKeysUserTasks(@RequestBody AuditUser user) { TaskService taskService = processEngine.getTaskService(); service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java
@@ -1,13 +1,10 @@ package com.java110.oa.bmo.oaWorkflow.impl; import com.java110.dto.oaWorkflow.OaWorkflowDto; import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO; import com.java110.utils.util.Assert; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -25,7 +22,7 @@ @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; /** service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
@@ -9,7 +9,7 @@ import com.java110.dto.user.UserDto; import com.java110.dto.workflowDataFile.WorkflowDataFileDto; import com.java110.entity.audit.AuditUser; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; @@ -47,7 +47,7 @@ private IUserInnerServiceSMO userInnerServiceSMOImpl; @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Autowired private IOaWorkflowDataInnerServiceSMO oaWorkflowDataInnerServiceSMOImpl; service-oa/src/main/java/com/java110/oa/cmd/oaWorkflow/QueryFirstAuditStaffCmd.java
@@ -7,7 +7,7 @@ import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.oaWorkflow.OaWorkflowDto; import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO; import com.java110.utils.exception.CmdException; @@ -31,7 +31,7 @@ private IOaWorkflowXmlInnerServiceSMO oaWorkflowXmlInnerServiceSMOImpl; @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Override service-oa/src/main/java/com/java110/oa/cmd/oaWorkflow/QueryNextDealUserCmd.java
@@ -5,7 +5,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.vo.ResultVo; @@ -21,7 +21,7 @@ public class QueryNextDealUserCmd extends Cmd { @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { springboot/src/main/java/com/java110/boot/smo/undo/impl/UndoSMOImpl.java
@@ -4,14 +4,11 @@ import com.java110.boot.smo.DefaultAbstractComponentSMO; import com.java110.boot.smo.undo.IUndoSMO; import com.java110.core.context.IPageData; import com.java110.dto.itemReleaseType.ItemReleaseTypeDto; import com.java110.dto.oaWorkflow.OaWorkflowDto; import com.java110.dto.user.UserDto; import com.java110.dto.workflow.WorkflowDto; import com.java110.entity.audit.AuditUser; import com.java110.entity.component.ComponentValidateResult; import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO; import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO; import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO; import com.java110.intf.oa.IOaWorkflowInnerServiceSMO; import com.java110.utils.exception.SMOException; import com.java110.vo.ResultVo; @@ -36,7 +33,7 @@ private RestTemplate restTemplate; @Autowired private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl; @Autowired
