From 2fa59cb896243a42623dfb210dc5f426d9f93a78 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 22 二月 2023 00:23:56 +0800
Subject: [PATCH] 优化考勤人员
---
service-common/src/main/java/com/java110/common/api/WorkflowApi.java | 55 +++++++++++++++++++------------------------------------
1 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/WorkflowApi.java b/service-common/src/main/java/com/java110/common/api/WorkflowApi.java
index 3a757eb..27ed26a 100755
--- a/service-common/src/main/java/com/java110/common/api/WorkflowApi.java
+++ b/service-common/src/main/java/com/java110/common/api/WorkflowApi.java
@@ -7,21 +7,12 @@
import com.java110.dto.workflow.WorkflowDto;
import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.activiti.editor.constants.ModelDataJsonConstants;
import org.activiti.engine.ActivitiException;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.Model;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.PNGTranscoder;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -33,13 +24,10 @@
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
@RestController
@RequestMapping("/workflow")
public class WorkflowApi {
+
private static final Logger logger = LoggerFactory.getLogger(WorkflowApi.class);
@Autowired
@@ -48,45 +36,42 @@
@Autowired
private ObjectMapper objectMapper;
-
-
String MODEL_ID = "modelId";
String MODEL_NAME = "name";
String MODEL_REVISION = "revision";
String MODEL_DESCRIPTION = "description";
-
-
@Autowired
private IQueryWorkFlowFirstStaffBMO queryWorkFlowFirstStaffBMOImpl;
-
- @RequestMapping(value = "/getFirstStaff", method = RequestMethod.GET)
- public ResponseEntity<String> getFirstStaff(@RequestParam(name = "flowType") String flowType,
- @RequestParam(name = "communityId") String communityId,
- @RequestHeader(value = "store-id") String storeId) {
- WorkflowDto workflowDto = new WorkflowDto();
- workflowDto.setCommunityId(communityId);
- workflowDto.setFlowType(flowType);
- workflowDto.setStoreId(storeId);
- return queryWorkFlowFirstStaffBMOImpl.query(workflowDto);
- }
-
/**
* 鏇存柊娴佺▼
*
- * @param reqJson 妯″瀷ID
+ * @param reqString 妯″瀷ID
* @ServiceCode /workflow/saveModel
*/
@RequestMapping(value = "/saveModel", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public ResponseEntity<String> saveModel(
- @RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> saveModel(@RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
-
//閮ㄧ讲model
return queryWorkFlowFirstStaffBMOImpl.saveModel(workflowModelDto);
+ }
+ /**
+ * 閮ㄧ讲娴佺▼
+ *
+ * @param reqString 妯″瀷ID
+ * @ServiceCode /workflow/deployModel
+ */
+ @RequestMapping(value = "/deployModel", method = RequestMethod.POST)
+ @ResponseStatus(value = HttpStatus.OK)
+ public ResponseEntity<String> deployModel(@RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
+ WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
+ //閮ㄧ讲model
+ return queryWorkFlowFirstStaffBMOImpl.deployModel(workflowModelDto);
}
@@ -121,6 +106,4 @@
}
return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
}
-
-
}
--
Gitblit v1.8.0