diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java index 36cd853653c7edfe80b9ac2558fbe2c3e469fd81..410c5831e4b60da0779c7f573e90f35be0a3a55e 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java @@ -1,56 +1,57 @@ package neatlogic.module.process.api.process; -import neatlogic.framework.process.util.ProcessConfigUtil; -import neatlogic.framework.restful.constvalue.OperationTypeEnum; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.process.auth.PROCESS_MODIFY; +import neatlogic.framework.process.dto.ProcessDraftVo; +import neatlogic.framework.process.exception.process.ProcessDraftNotFoundException; import neatlogic.framework.restful.annotation.*; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.framework.process.auth.PROCESS_MODIFY; - import neatlogic.module.process.dao.mapper.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dto.ProcessDraftVo; -import neatlogic.framework.process.exception.process.ProcessDraftNotFoundException; @Service @OperationType(type = OperationTypeEnum.SEARCH) @AuthAction(action = PROCESS_MODIFY.class) public class ProcessDraftGetApi extends PrivateApiComponentBase { - @Autowired - private ProcessMapper processMapper; - - @Override - public String getToken() { - return "process/draft/get"; - } - - @Override - public String getName() { - return "流程草稿信息获取接口"; - } - - @Override - public String getConfig() { - return null; - } - - @Input({@Param(name = "uuid", type = ApiParamType.STRING, isRequired = true, desc = "草稿uuid")}) - @Output({@Param(explode = ProcessDraftVo.class)}) - @Description(desc="流程草稿信息获取接口") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - String uuid = jsonObj.getString("uuid"); - ProcessDraftVo processDraftVo = processMapper.getProcessDraftByUuid(uuid); - if(processDraftVo == null) { - throw new ProcessDraftNotFoundException(uuid); - } - processDraftVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processDraftVo.getConfig())); - return processDraftVo; - } + @Autowired + private ProcessMapper processMapper; + + @Override + public String getToken() { + return "process/draft/get"; + } + + @Override + public String getName() { + return "nmpap.processdraftgetapi.getname"; + } + + @Override + public String getConfig() { + return null; + } + + @Input({ + @Param(name = "uuid", type = ApiParamType.STRING, isRequired = true, desc = "common.uuid") + }) + @Output({ + @Param(explode = ProcessDraftVo.class) + }) + @Description(desc = "nmpap.processdraftgetapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + String uuid = jsonObj.getString("uuid"); + ProcessDraftVo processDraftVo = processMapper.getProcessDraftByUuid(uuid); + if (processDraftVo == null) { + throw new ProcessDraftNotFoundException(uuid); + } +// processDraftVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processDraftVo.getConfig())); + return processDraftVo; + } } diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java index eba3aa7fa4c73fddcebfd103b82d373dc0dd86fa..9d60d32dba0a701694f887b6163dce690d2f3736 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java @@ -1,23 +1,19 @@ package neatlogic.module.process.api.process; -import neatlogic.framework.process.util.ProcessConfigUtil; -import neatlogic.framework.restful.constvalue.OperationTypeEnum; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.asynchronization.threadlocal.UserContext; +import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.process.auth.PROCESS_MODIFY; +import neatlogic.framework.process.dto.ProcessDraftVo; import neatlogic.framework.restful.annotation.*; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.framework.process.auth.PROCESS_MODIFY; - import neatlogic.module.process.dao.mapper.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.asynchronization.threadlocal.UserContext; -import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dto.ProcessDraftVo; - @Service @Transactional @OperationType(type = OperationTypeEnum.CREATE) @@ -34,7 +30,7 @@ public class ProcessDraftSaveApi extends PrivateApiComponentBase { @Override public String getName() { - return "流程草稿保存接口"; + return "nmpap.processdraftsaveapi.getname"; } @Override @@ -42,11 +38,15 @@ public class ProcessDraftSaveApi extends PrivateApiComponentBase { return null; } - @Input({ @Param(name = "processUuid", type = ApiParamType.STRING, desc = "流程uuid", isRequired = true), - @Param(name = "name", type = ApiParamType.STRING, xss = true, isRequired = false, maxLength = 50, desc = "流程名称"), - @Param(name = "config", type = ApiParamType.JSONOBJECT, desc = "流程配置内容", isRequired = true) }) - @Output({ @Param(name = "uuid", type = ApiParamType.STRING, desc = "草稿uuid") }) - @Description(desc = "流程草稿保存接口") + @Input({ + @Param(name = "processUuid", type = ApiParamType.STRING, desc = "term.itsm.processuuid", isRequired = true), + @Param(name = "name", type = ApiParamType.STRING, xss = true, isRequired = false, maxLength = 50, desc = "common.name"), + @Param(name = "config", type = ApiParamType.JSONOBJECT, desc = "common.config", isRequired = true) + }) + @Output({ + @Param(name = "uuid", type = ApiParamType.STRING, desc = "草稿uuid") + }) + @Description(desc = "nmpap.processdraftsaveapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { ProcessDraftVo processDraftVo = JSONObject.toJavaObject(jsonObj, ProcessDraftVo.class); @@ -66,7 +66,7 @@ public class ProcessDraftSaveApi extends PrivateApiComponentBase { if (earliestUuid != null) { processMapper.deleteProcessDraftByUuid(earliestUuid); } - processDraftVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processDraftVo.getConfig())); +// processDraftVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processDraftVo.getConfig())); processMapper.insertProcessDraft(processDraftVo); return processDraftVo.getUuid(); }